diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-01-06 23:53:53 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-01-06 23:54:15 +0000 |
| commit | a1ce1647aed9c3038289c0a1919fd564e42514ba (patch) | |
| tree | 84e7c2a659902aca2537228d68e50368ce5451b0 | |
| parent | 7bd9a5a243b926896dda39a97813110712ad33ba (diff) | |
| download | craftbukkit-a1ce1647aed9c3038289c0a1919fd564e42514ba.tar craftbukkit-a1ce1647aed9c3038289c0a1919fd564e42514ba.tar.gz craftbukkit-a1ce1647aed9c3038289c0a1919fd564e42514ba.tar.lz craftbukkit-a1ce1647aed9c3038289c0a1919fd564e42514ba.tar.xz craftbukkit-a1ce1647aed9c3038289c0a1919fd564e42514ba.zip | |
Fix mistake in vine growth
| -rw-r--r-- | nms-patches/BlockVine.patch | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/nms-patches/BlockVine.patch b/nms-patches/BlockVine.patch index 6eecda4e..12c6a208 100644 --- a/nms-patches/BlockVine.patch +++ b/nms-patches/BlockVine.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/BlockVine.java 2014-11-28 17:43:42.977707438 +0000 -+++ src/main/java/net/minecraft/server/BlockVine.java 2014-11-28 17:38:21.000000000 +0000 +--- ../work/decompile-8eb82bde//net/minecraft/server/BlockVine.java 2015-01-06 23:53:23.903653254 +0000 ++++ src/main/java/net/minecraft/server/BlockVine.java 2015-01-06 23:53:23.903653254 +0000 @@ -3,6 +3,8 @@ import java.util.Iterator; import java.util.Random; @@ -24,37 +24,36 @@ } } -@@ -222,18 +230,30 @@ - boolean flag2 = ((Boolean) iblockdata.get(a(enumdirection2))).booleanValue(); +@@ -223,17 +231,29 @@ BlockPosition blockposition2 = blockposition1.shift(enumdirection1); BlockPosition blockposition3 = blockposition1.shift(enumdirection2); -+ + + // CraftBukkit start - Call BlockSpreadEvent + org.bukkit.block.Block source = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); + org.bukkit.block.Block bukkitBlock = world.getWorld().getBlockAt(blockposition1.getX(), blockposition1.getY(), blockposition1.getZ()); - ++ if (flag1 && this.c(world.getType(blockposition2).getBlock())) { - world.setTypeAndData(blockposition1, this.getBlockData().set(a(enumdirection1), Boolean.valueOf(true)), 2); + // world.setTypeAndData(blockposition1, this.getBlockData().set(a(enumdirection1), Boolean.valueOf(true)), 2); -+ CraftEventFactory.handleBlockSpreadEvent(bukkitBlock, source, block, toLegacyData(this.getBlockData().set(a(enumdirection1), Boolean.valueOf(true)))); ++ CraftEventFactory.handleBlockSpreadEvent(bukkitBlock, source, this, toLegacyData(this.getBlockData().set(a(enumdirection1), Boolean.valueOf(true)))); } else if (flag2 && this.c(world.getType(blockposition3).getBlock())) { - world.setTypeAndData(blockposition1, this.getBlockData().set(a(enumdirection2), Boolean.valueOf(true)), 2); + // world.setTypeAndData(blockposition1, this.getBlockData().set(a(enumdirection2), Boolean.valueOf(true)), 2); -+ CraftEventFactory.handleBlockSpreadEvent(bukkitBlock, source, block, toLegacyData(this.getBlockData().set(a(enumdirection2), Boolean.valueOf(true)))); ++ CraftEventFactory.handleBlockSpreadEvent(bukkitBlock, source, this, toLegacyData(this.getBlockData().set(a(enumdirection2), Boolean.valueOf(true)))); } else if (flag1 && world.isEmpty(blockposition2) && this.c(world.getType(blockposition.shift(enumdirection1)).getBlock())) { - world.setTypeAndData(blockposition2, this.getBlockData().set(a(enumdirection.opposite()), Boolean.valueOf(true)), 2); + // world.setTypeAndData(blockposition2, this.getBlockData().set(a(enumdirection.opposite()), Boolean.valueOf(true)), 2); + bukkitBlock = world.getWorld().getBlockAt(blockposition2.getX(), blockposition2.getY(), blockposition2.getZ()); -+ CraftEventFactory.handleBlockSpreadEvent(bukkitBlock, source, block, toLegacyData(this.getBlockData().set(a(enumdirection.opposite()), Boolean.valueOf(true)))); ++ CraftEventFactory.handleBlockSpreadEvent(bukkitBlock, source, this, toLegacyData(this.getBlockData().set(a(enumdirection.opposite()), Boolean.valueOf(true)))); } else if (flag2 && world.isEmpty(blockposition3) && this.c(world.getType(blockposition.shift(enumdirection2)).getBlock())) { - world.setTypeAndData(blockposition3, this.getBlockData().set(a(enumdirection.opposite()), Boolean.valueOf(true)), 2); + // world.setTypeAndData(blockposition3, this.getBlockData().set(a(enumdirection.opposite()), Boolean.valueOf(true)), 2); + bukkitBlock = world.getWorld().getBlockAt(blockposition3.getX(), blockposition3.getY(), blockposition3.getZ()); -+ CraftEventFactory.handleBlockSpreadEvent(bukkitBlock, source, block, toLegacyData(this.getBlockData().set(a(enumdirection.opposite()), Boolean.valueOf(true)))); ++ CraftEventFactory.handleBlockSpreadEvent(bukkitBlock, source, this, toLegacyData(this.getBlockData().set(a(enumdirection.opposite()), Boolean.valueOf(true)))); } else if (this.c(world.getType(blockposition1.up()).getBlock())) { - world.setTypeAndData(blockposition1, this.getBlockData(), 2); + // world.setTypeAndData(blockposition1, this.getBlockData(), 2); -+ CraftEventFactory.handleBlockSpreadEvent(bukkitBlock, source, block, toLegacyData(this.getBlockData())); ++ CraftEventFactory.handleBlockSpreadEvent(bukkitBlock, source, this, toLegacyData(this.getBlockData())); } + // CraftBukkit end } else if (block.material.k() && block.d()) { @@ -65,7 +64,7 @@ if (((Boolean) iblockdata3.get(BlockVine.NORTH)).booleanValue() || ((Boolean) iblockdata3.get(BlockVine.EAST)).booleanValue() || ((Boolean) iblockdata3.get(BlockVine.SOUTH)).booleanValue() || ((Boolean) iblockdata3.get(BlockVine.WEST)).booleanValue()) { - world.setTypeAndData(blockposition1, iblockdata3, 2); -+ // CraftBukkit start - Call BlockSpreadEvent ++ // CraftBukkit start - Call BlockSpreadEvent + // world.setTypeAndData(blockposition1, iblockdata3, 2); + org.bukkit.block.Block source = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); + org.bukkit.block.Block bukkitBlock = world.getWorld().getBlockAt(blockposition1.getX(), blockposition1.getY(), blockposition1.getZ()); |