diff options
author | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-11-23 00:08:56 +0000 |
---|---|---|
committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-11-23 00:08:56 +0000 |
commit | 03762600df11ee775c55e9e6129d1ed386b83b6a (patch) | |
tree | b9632db2f2cb7c9f2e2dc632d004620aaa8499e6 /src/main/java/net/minecraft/server/BlockTrapdoor.java | |
parent | 929e5ff6c762228952f873166f1bd985c68ed1e3 (diff) | |
download | craftbukkit-03762600df11ee775c55e9e6129d1ed386b83b6a.tar craftbukkit-03762600df11ee775c55e9e6129d1ed386b83b6a.tar.gz craftbukkit-03762600df11ee775c55e9e6129d1ed386b83b6a.tar.lz craftbukkit-03762600df11ee775c55e9e6129d1ed386b83b6a.tar.xz craftbukkit-03762600df11ee775c55e9e6129d1ed386b83b6a.zip |
Fixed trapdoors + few comments
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockTrapdoor.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockTrapdoor.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/BlockTrapdoor.java b/src/main/java/net/minecraft/server/BlockTrapdoor.java index 153e8961..a69c4063 100644 --- a/src/main/java/net/minecraft/server/BlockTrapdoor.java +++ b/src/main/java/net/minecraft/server/BlockTrapdoor.java @@ -30,7 +30,7 @@ public class BlockTrapdoor extends Block { } public AxisAlignedBB e(World world, int i, int j, int k) { - this.a(world, i, j, k); + this.a((IBlockAccess)world, i, j, k); // CraftBukkit - Make sure this points to the below method! return super.e(world, i, j, k); } @@ -121,14 +121,14 @@ public class BlockTrapdoor extends Block { } // CraftBukkit start - if (l > 0 && Block.byId[l] != null && Block.byId[l].isPowerSource()) { + if (l > 0) { org.bukkit.World bworld = world.getWorld(); org.bukkit.block.Block block = bworld.getBlockAt(i, j, k); int power = block.getBlockPower(); int oldPower = (world.getData(i, j, k) & 4) > 0 ? 15 : 0; - if (oldPower == 0 ^ power == 0) { + if (oldPower == 0 ^ power == 0 || (Block.byId[l] != null && Block.byId[l].isPowerSource())) { BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, oldPower, power); world.getServer().getPluginManager().callEvent(eventRedstone); |