2015-02-26 23:41:06 +01:00
|
|
|
--- /home/matt/mc-dev-private//net/minecraft/server/BlockTrapdoor.java 2015-02-26 22:40:22.275608143 +0000
|
|
|
|
|
+++ src/main/java/net/minecraft/server/BlockTrapdoor.java 2015-02-26 22:40:22.275608143 +0000
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -2,6 +2,8 @@
|
|
|
|
|
|
|
|
|
|
import com.google.common.base.Predicate;
|
|
|
|
|
|
|
|
|
|
+import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit
|
|
|
|
|
+
|
|
|
|
|
public class BlockTrapdoor extends Block {
|
|
|
|
|
|
2015-02-26 23:41:06 +01:00
|
|
|
public static final BlockStateDirection FACING = BlockStateDirection.of("facing", (Predicate) EnumDirection.EnumDirectionLimit.HORIZONTAL);
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -101,6 +103,19 @@
|
|
|
|
|
boolean flag = world.isBlockIndirectlyPowered(blockposition);
|
|
|
|
|
|
|
|
|
|
if (flag || block.isPowerSource()) {
|
|
|
|
|
+ // CraftBukkit start
|
|
|
|
|
+ org.bukkit.World bworld = world.getWorld();
|
|
|
|
|
+ org.bukkit.block.Block bblock = bworld.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
|
|
|
|
+
|
|
|
|
|
+ int power = bblock.getBlockPower();
|
|
|
|
|
+ int oldPower = (Boolean) iblockdata.get(OPEN) ? 15 : 0;
|
|
|
|
|
+
|
|
|
|
|
+ if (oldPower == 0 ^ power == 0 || block.isPowerSource()) {
|
|
|
|
|
+ BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(bblock, oldPower, power);
|
|
|
|
|
+ world.getServer().getPluginManager().callEvent(eventRedstone);
|
|
|
|
|
+ flag = eventRedstone.getNewCurrent() > 0;
|
|
|
|
|
+ }
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
boolean flag1 = ((Boolean) iblockdata.get(BlockTrapdoor.OPEN)).booleanValue();
|
|
|
|
|
|
|
|
|
|
if (flag1 != flag) {
|
