diff options
| author | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-11-28 07:00:04 +0000 |
|---|---|---|
| committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-11-28 07:00:04 +0000 |
| commit | 7db72dfd2c3d836a26375aa34d8aa37cf179c726 (patch) | |
| tree | c01cff99f0c06cf18222bc28402080770b1c284b /src | |
| parent | 91b673e375ee08791b15f5d9c153c28fa6c718eb (diff) | |
| download | craftbukkit-7db72dfd2c3d836a26375aa34d8aa37cf179c726.tar craftbukkit-7db72dfd2c3d836a26375aa34d8aa37cf179c726.tar.gz craftbukkit-7db72dfd2c3d836a26375aa34d8aa37cf179c726.tar.lz craftbukkit-7db72dfd2c3d836a26375aa34d8aa37cf179c726.tar.xz craftbukkit-7db72dfd2c3d836a26375aa34d8aa37cf179c726.zip | |
Doors and trapdoors should function correctly once again
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/net/minecraft/server/BlockDoor.java | 2 | ||||
| -rw-r--r-- | src/main/java/net/minecraft/server/BlockTrapdoor.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/BlockDoor.java b/src/main/java/net/minecraft/server/BlockDoor.java index 8dc9e9ee..de1fe86c 100644 --- a/src/main/java/net/minecraft/server/BlockDoor.java +++ b/src/main/java/net/minecraft/server/BlockDoor.java @@ -166,8 +166,8 @@ public class BlockDoor extends Block { if (!world.isStatic) { this.b(world, i, j, k, i1, 0); } - } else if (l > 0) { // CraftBukkit start + } else if (l > 0 && Block.byId[l].isPowerSource()) { org.bukkit.World bworld = world.getWorld(); org.bukkit.block.Block block = bworld.getBlockAt(i, j, k); org.bukkit.block.Block blockTop = bworld.getBlockAt(i, j + 1, k); diff --git a/src/main/java/net/minecraft/server/BlockTrapdoor.java b/src/main/java/net/minecraft/server/BlockTrapdoor.java index a69c4063..18bcf1c7 100644 --- a/src/main/java/net/minecraft/server/BlockTrapdoor.java +++ b/src/main/java/net/minecraft/server/BlockTrapdoor.java @@ -121,7 +121,7 @@ public class BlockTrapdoor extends Block { } // CraftBukkit start - if (l > 0) { + if (l > 0 && Block.byId[l] != null && Block.byId[l].isPowerSource()) { org.bukkit.World bworld = world.getWorld(); org.bukkit.block.Block block = bworld.getBlockAt(i, j, k); |