2015-01-07 00:53:53 +01:00
|
|
|
--- ../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
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -3,6 +3,8 @@
|
|
|
|
|
import java.util.Iterator;
|
|
|
|
|
import java.util.Random;
|
|
|
|
|
|
|
|
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
|
|
|
|
|
+
|
|
|
|
|
public class BlockVine extends Block {
|
|
|
|
|
|
|
|
|
|
public static final BlockStateBoolean UP = BlockStateBoolean.of("up");
|
|
|
|
|
@@ -203,7 +205,13 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (((Boolean) iblockdata1.get(BlockVine.NORTH)).booleanValue() || ((Boolean) iblockdata1.get(BlockVine.EAST)).booleanValue() || ((Boolean) iblockdata1.get(BlockVine.SOUTH)).booleanValue() || ((Boolean) iblockdata1.get(BlockVine.WEST)).booleanValue()) {
|
|
|
|
|
- world.setTypeAndData(blockposition.up(), iblockdata1, 2);
|
|
|
|
|
+ // CraftBukkit start - Call BlockSpreadEvent
|
|
|
|
|
+ // world.setTypeAndData(blockposition.up(), iblockdata1, 2);
|
|
|
|
|
+ BlockPosition target = blockposition.up();
|
|
|
|
|
+ org.bukkit.block.Block source = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
|
|
|
|
+ org.bukkit.block.Block block = world.getWorld().getBlockAt(target.getX(), target.getY(), target.getZ());
|
|
|
|
|
+ CraftEventFactory.handleBlockSpreadEvent(block, source, this, toLegacyData(iblockdata1));
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
2015-01-07 00:53:53 +01:00
|
|
|
@@ -223,17 +231,29 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
BlockPosition blockposition2 = blockposition1.shift(enumdirection1);
|
|
|
|
|
BlockPosition blockposition3 = blockposition1.shift(enumdirection2);
|
2015-01-07 00:53:53 +01:00
|
|
|
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // 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());
|
2015-01-07 00:53:53 +01:00
|
|
|
+
|
2014-11-25 22:32:16 +01:00
|
|
|
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);
|
2015-01-07 00:53:53 +01:00
|
|
|
+ CraftEventFactory.handleBlockSpreadEvent(bukkitBlock, source, this, toLegacyData(this.getBlockData().set(a(enumdirection1), Boolean.valueOf(true))));
|
2014-11-25 22:32:16 +01:00
|
|
|
} 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);
|
2015-01-07 00:53:53 +01:00
|
|
|
+ CraftEventFactory.handleBlockSpreadEvent(bukkitBlock, source, this, toLegacyData(this.getBlockData().set(a(enumdirection2), Boolean.valueOf(true))));
|
2014-11-25 22:32:16 +01:00
|
|
|
} 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());
|
2015-01-07 00:53:53 +01:00
|
|
|
+ CraftEventFactory.handleBlockSpreadEvent(bukkitBlock, source, this, toLegacyData(this.getBlockData().set(a(enumdirection.opposite()), Boolean.valueOf(true))));
|
2014-11-25 22:32:16 +01:00
|
|
|
} 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());
|
2015-01-07 00:53:53 +01:00
|
|
|
+ CraftEventFactory.handleBlockSpreadEvent(bukkitBlock, source, this, toLegacyData(this.getBlockData().set(a(enumdirection.opposite()), Boolean.valueOf(true))));
|
2014-11-25 22:32:16 +01:00
|
|
|
} else if (this.c(world.getType(blockposition1.up()).getBlock())) {
|
|
|
|
|
- world.setTypeAndData(blockposition1, this.getBlockData(), 2);
|
|
|
|
|
+ // world.setTypeAndData(blockposition1, this.getBlockData(), 2);
|
2015-01-07 00:53:53 +01:00
|
|
|
+ CraftEventFactory.handleBlockSpreadEvent(bukkitBlock, source, this, toLegacyData(this.getBlockData()));
|
2014-11-25 22:32:16 +01:00
|
|
|
}
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
} else if (block.material.k() && block.d()) {
|
|
|
|
|
world.setTypeAndData(blockposition, iblockdata.set(a(enumdirection), Boolean.valueOf(true)), 2);
|
|
|
|
|
}
|
|
|
|
|
@@ -260,7 +280,12 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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);
|
2015-01-07 00:53:53 +01:00
|
|
|
+ // CraftBukkit start - Call BlockSpreadEvent
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // 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());
|
|
|
|
|
+ CraftEventFactory.handleBlockSpreadEvent(bukkitBlock, source, this, toLegacyData(iblockdata3));
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
}
|
|
|
|
|
} else if (block1 == this) {
|
|
|
|
|
iblockdata3 = iblockdata2;
|
