Skip to content
This repository has been archived by the owner on Jan 26, 2019. It is now read-only.

Commit

Permalink
Revert PaperSpigot fix for #117 (PaperMC/Paper-1.7@0f7e4b9)
Browse files Browse the repository at this point in the history
  • Loading branch information
sameer committed Feb 17, 2016
1 parent d1c6ca5 commit bf114e6
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions patches/net/minecraft/block/BlockDynamicLiquid.java.patch
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,13 @@
}
else
{
@@ -113,21 +136,35 @@
@@ -113,21 +136,36 @@

if (this.func_149809_q(p_149674_1_, p_149674_2_, p_149674_3_ - 1, p_149674_4_))
{
- if (this.blockMaterial == Material.lava && p_149674_1_.getBlock(p_149674_2_, p_149674_3_ - 1, p_149674_4_).getMaterial() == Material.water)
+ if (p_149674_1_.getType(p_149674_2_, p_149674_3_, p_149674_4_).getMaterial() != this.blockMaterial) { return; } // PaperSpigot - Stop updating flowing block if material has changed
+ //if (p_149674_1_.getType(p_149674_2_, p_149674_3_, p_149674_4_).getMaterial() != this.blockMaterial) { return; } // PaperSpigot - Stop updating flowing block if material has changed
+
+ // CraftBukkit start - Send "down" to the server
+ BlockFromToEvent event = new BlockFromToEvent(source, BlockFace.DOWN);
+
Expand Down Expand Up @@ -115,7 +116,7 @@
}
else if (l >= 0 && (l == 0 || this.func_149807_p(p_149674_1_, p_149674_2_, p_149674_3_ - 1, p_149674_4_)))
{
@@ -144,25 +181,31 @@
@@ -144,25 +182,31 @@
return;
}

Expand Down

0 comments on commit bf114e6

Please sign in to comment.