diff options
| author | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-12-01 21:43:54 +0000 |
|---|---|---|
| committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-12-01 21:43:54 +0000 |
| commit | 062d94d6bc8ecb42b28214bd8a91488aecc3409a (patch) | |
| tree | be32201a87127557b99d18849c4501618e98f792 /src/main/java/net/minecraft/server/BlockDoor.java | |
| parent | 650717ad32a4294ecfff951c86a812d7b5b74974 (diff) | |
| download | craftbukkit-062d94d6bc8ecb42b28214bd8a91488aecc3409a.tar craftbukkit-062d94d6bc8ecb42b28214bd8a91488aecc3409a.tar.gz craftbukkit-062d94d6bc8ecb42b28214bd8a91488aecc3409a.tar.lz craftbukkit-062d94d6bc8ecb42b28214bd8a91488aecc3409a.tar.xz craftbukkit-062d94d6bc8ecb42b28214bd8a91488aecc3409a.zip | |
Implemented 1.0.1 fixes. This fixes BUKKIT-3, BUKKIT-39, BUKKIT-150
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockDoor.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/BlockDoor.java | 4 |
1 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 a17f015c..b2482240 100644 --- a/src/main/java/net/minecraft/server/BlockDoor.java +++ b/src/main/java/net/minecraft/server/BlockDoor.java @@ -143,7 +143,7 @@ public class BlockDoor extends Block { world.setTypeId(i, j, k, 0); } - if (l > 0 && Block.byId[l].isPowerSource()) { + if (l > 0 && l != this.id) { this.doPhysics(world, i, j - 1, k, l); } } else { @@ -166,8 +166,8 @@ public class BlockDoor extends Block { if (!world.isStatic) { this.b(world, i, j, k, i1, 0); } + } else if (l > 0 && l != this.id) { // 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); |