diff options
author | Tahg <tahgtahv@gmail.com> | 2011-03-11 16:25:35 -0500 |
---|---|---|
committer | Tahg <tahgtahv@gmail.com> | 2011-03-11 16:25:35 -0500 |
commit | 078f48c0fb18a9b1afb35e094cccbb071007b870 (patch) | |
tree | c72f08a674d30d3a8a94bbf2faf68bd4fb224182 /src/main/java/net/minecraft/server/BlockDoor.java | |
parent | 786fdfb9fed75ebabfb4648a824ff39de91fbc35 (diff) | |
download | craftbukkit-078f48c0fb18a9b1afb35e094cccbb071007b870.tar craftbukkit-078f48c0fb18a9b1afb35e094cccbb071007b870.tar.gz craftbukkit-078f48c0fb18a9b1afb35e094cccbb071007b870.tar.lz craftbukkit-078f48c0fb18a9b1afb35e094cccbb071007b870.tar.xz craftbukkit-078f48c0fb18a9b1afb35e094cccbb071007b870.zip |
Code cleanup, fixed doors, chunk entity fetching
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockDoor.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockDoor.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/BlockDoor.java b/src/main/java/net/minecraft/server/BlockDoor.java index 189cc311..53f9e803 100644 --- a/src/main/java/net/minecraft/server/BlockDoor.java +++ b/src/main/java/net/minecraft/server/BlockDoor.java @@ -171,15 +171,18 @@ public class BlockDoor extends Block { } else if (l > 0 && Block.byId[l].c()) { boolean flag1 = world.p(i, j, k) || world.p(i, j + 1, k); - //Craftbukkit start + // Craftbukkit start CraftWorld craftWorld = ((WorldServer) world).getWorld(); CraftServer server = ((WorldServer) world).getServer(); org.bukkit.block.Block block = craftWorld.getBlockAt(i, j, k); + org.bukkit.block.Block blockTop = craftWorld.getBlockAt(i, j + 1, k); int power = block.getBlockPower(); - BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, (world.getData(i, j, k) & 4) > 0 ? 15: 0, flag1 ? 15 : 0); + int powerTop = blockTop.getBlockPower(); + if (powerTop > power) power = powerTop; + BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, (world.getData(i, j, k) & 4) > 0 ? 15: 0, power); server.getPluginManager().callEvent(eventRedstone); - this.a(world, i, j, k, eventRedstone.getNewCurrent()); - //Craftbukkit end + this.a(world, i, j, k, eventRedstone.getNewCurrent() > 0); + // Craftbukkit end } } } |