diff options
| author | Travis Watkins <amaranth@ubuntu.com> | 2013-03-13 17:33:27 -0500 |
|---|---|---|
| committer | Travis Watkins <amaranth@ubuntu.com> | 2013-03-15 13:28:59 -0500 |
| commit | 83d29e461c85733f0113b6eb19db6e3b42da2949 (patch) | |
| tree | b3063a1c28f478ab368d5ba3413a842def68c28f /src/main/java/net/minecraft/server/ItemDoor.java | |
| parent | ba6e4c38cfa98ad291974195cc46d70a4f138ac1 (diff) | |
| download | craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.gz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.lz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.xz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.zip | |
Update CraftBukkit to Minecraft 1.5
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemDoor.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/ItemDoor.java | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/main/java/net/minecraft/server/ItemDoor.java b/src/main/java/net/minecraft/server/ItemDoor.java index ea19a3ab..438a69ad 100644 --- a/src/main/java/net/minecraft/server/ItemDoor.java +++ b/src/main/java/net/minecraft/server/ItemDoor.java @@ -72,8 +72,8 @@ public class ItemDoor extends Item { b0 = 1; } - int i1 = (world.t(i - b0, j, k - b1) ? 1 : 0) + (world.t(i - b0, j + 1, k - b1) ? 1 : 0); - int j1 = (world.t(i + b0, j, k + b1) ? 1 : 0) + (world.t(i + b0, j + 1, k + b1) ? 1 : 0); + int i1 = (world.u(i - b0, j, k - b1) ? 1 : 0) + (world.u(i - b0, j + 1, k - b1) ? 1 : 0); + int j1 = (world.u(i + b0, j, k + b1) ? 1 : 0) + (world.u(i + b0, j + 1, k + b1) ? 1 : 0); boolean flag = world.getTypeId(i - b0, j, k - b1) == block.id || world.getTypeId(i - b0, j + 1, k - b1) == block.id; boolean flag1 = world.getTypeId(i + b0, j, k + b1) == block.id || world.getTypeId(i + b0, j + 1, k + b1) == block.id; boolean flag2 = false; @@ -84,7 +84,6 @@ public class ItemDoor extends Item { flag2 = true; } - world.suppressPhysics = true; // CraftBukkit start if (entityhuman != null) { if(!ItemBlock.processBlockPlace(world, entityhuman, null, i, j, k, block.id, l, clickedX, clickedY, clickedZ)) { @@ -96,14 +95,11 @@ public class ItemDoor extends Item { ((EntityPlayer) entityhuman).playerConnection.sendPacket(new Packet53BlockChange(i, j + 1, k, world)); return true; } - - world.suppressPhysics = true; } else { - world.setTypeIdAndData(i, j, k, block.id, l); + world.setTypeIdAndData(i, j, k, block.id, l, 2); } // CraftBukkit end - world.setTypeIdAndData(i, j + 1, k, block.id, 8 | (flag2 ? 1 : 0)); - world.suppressPhysics = false; + world.setTypeIdAndData(i, j + 1, k, block.id, 8 | (flag2 ? 1 : 0), 2); world.applyPhysics(i, j, k, block.id); world.applyPhysics(i, j + 1, k, block.id); return true; // CraftBukkit |