summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockVine.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-06-09 11:43:49 +1000
committermd_5 <git@md-5.net>2016-06-09 11:43:49 +1000
commita8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d (patch)
tree9efb0ce242b802a188032bd500ef7afaf29032a3 /nms-patches/BlockVine.patch
parent0cd0397a8295992112ad3bf0d37795a04d22503e (diff)
downloadcraftbukkit-a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d.tar
craftbukkit-a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d.tar.gz
craftbukkit-a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d.tar.lz
craftbukkit-a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d.tar.xz
craftbukkit-a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d.zip
Update to Minecraft 1.10
Diffstat (limited to 'nms-patches/BlockVine.patch')
-rw-r--r--nms-patches/BlockVine.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/nms-patches/BlockVine.patch b/nms-patches/BlockVine.patch
index c3b2a19d..03b7104c 100644
--- a/nms-patches/BlockVine.patch
+++ b/nms-patches/BlockVine.patch
@@ -32,20 +32,20 @@
+ org.bukkit.block.Block source = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
+ org.bukkit.block.Block bukkitBlock = world.getWorld().getBlockAt(blockposition2.getX(), blockposition2.getY(), blockposition2.getZ());
+
- if (flag1 && this.x(world.getType(blockposition3))) {
+ if (flag2 && this.x(world.getType(blockposition3))) {
- world.setTypeAndData(blockposition2, this.getBlockData().set(getDirection(enumdirection2), Boolean.valueOf(true)), 2);
+ // world.setTypeAndData(blockposition2, this.getBlockData().set(getDirection(enumdirection2), Boolean.valueOf(true)), 2);
+ CraftEventFactory.handleBlockSpreadEvent(bukkitBlock, source, this, toLegacyData(this.getBlockData().set(getDirection(enumdirection2), Boolean.valueOf(true))));
- } else if (flag2 && this.x(world.getType(blockposition4))) {
+ } else if (flag3 && this.x(world.getType(blockposition4))) {
- world.setTypeAndData(blockposition2, this.getBlockData().set(getDirection(enumdirection3), Boolean.valueOf(true)), 2);
+ // world.setTypeAndData(blockposition2, this.getBlockData().set(getDirection(enumdirection3), Boolean.valueOf(true)), 2);
+ CraftEventFactory.handleBlockSpreadEvent(bukkitBlock, source, this, toLegacyData(this.getBlockData().set(getDirection(enumdirection3), Boolean.valueOf(true))));
- } else if (flag1 && world.isEmpty(blockposition3) && this.x(world.getType(blockposition.shift(enumdirection2)))) {
+ } else if (flag2 && world.isEmpty(blockposition3) && this.x(world.getType(blockposition.shift(enumdirection2)))) {
- world.setTypeAndData(blockposition3, this.getBlockData().set(getDirection(enumdirection.opposite()), Boolean.valueOf(true)), 2);
+ // world.setTypeAndData(blockposition3, this.getBlockData().set(getDirection(enumdirection.opposite()), Boolean.valueOf(true)), 2);
+ bukkitBlock = world.getWorld().getBlockAt(blockposition3.getX(), blockposition3.getY(), blockposition3.getZ());
+ CraftEventFactory.handleBlockSpreadEvent(bukkitBlock, source, this, toLegacyData(this.getBlockData().set(getDirection(enumdirection.opposite()), Boolean.valueOf(true))));
- } else if (flag2 && world.isEmpty(blockposition4) && this.x(world.getType(blockposition.shift(enumdirection3)))) {
+ } else if (flag3 && world.isEmpty(blockposition4) && this.x(world.getType(blockposition.shift(enumdirection3)))) {
- world.setTypeAndData(blockposition4, this.getBlockData().set(getDirection(enumdirection.opposite()), Boolean.valueOf(true)), 2);
+ // world.setTypeAndData(blockposition4, this.getBlockData().set(getDirection(enumdirection.opposite()), Boolean.valueOf(true)), 2);
+ bukkitBlock = world.getWorld().getBlockAt(blockposition4.getX(), blockposition4.getY(), blockposition4.getZ());