diff options
| author | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-03-01 10:49:23 +0000 |
|---|---|---|
| committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-03-01 14:38:31 +0000 |
| commit | 543c4879fee3b7165764c5371d226c93fe3a657b (patch) | |
| tree | 4fe9116464e1fe42a40dc3ba19b58234bd26f821 /src/main/java/net/minecraft/server/ItemStep.java | |
| parent | e9ca87000c1794715bc3fe0a7d1caaf809057635 (diff) | |
| download | craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar.gz craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar.lz craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar.xz craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.zip | |
Updated CraftBukkit to 1.2
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemStep.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/ItemStep.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/ItemStep.java b/src/main/java/net/minecraft/server/ItemStep.java index 22ee385c..dfbbea16 100644 --- a/src/main/java/net/minecraft/server/ItemStep.java +++ b/src/main/java/net/minecraft/server/ItemStep.java @@ -23,10 +23,6 @@ public class ItemStep extends ItemBlock { } public boolean interactWith(ItemStack itemstack, EntityHuman entityhuman, World world, int i, int j, int k, int l) { - if (l != 1) { - ; - } - if (itemstack.count == 0) { return false; } else if (!entityhuman.d(i, j, k)) { @@ -34,8 +30,10 @@ public class ItemStep extends ItemBlock { } else { int i1 = world.getTypeId(i, j, k); int j1 = world.getData(i, j, k); + int k1 = j1 & 7; + boolean flag = (j1 & 8) != 0; - if (l == 1 && i1 == Block.STEP.id && j1 == itemstack.getData()) { + if ((l == 1 && !flag || l == 0 && flag) && i1 == Block.STEP.id && k1 == itemstack.getData()) { /* CraftBukkit start - handle this in super if (world.setTypeIdAndData(i, j, k, Block.DOUBLE_STEP.id, j1)) { world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), Block.DOUBLE_STEP.stepSound.getName(), (Block.DOUBLE_STEP.stepSound.getVolume1() + 1.0F) / 2.0F, Block.DOUBLE_STEP.stepSound.getVolume2() * 0.8F); |