diff options
| author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-15 20:19:14 +0100 |
|---|---|---|
| committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-15 20:19:14 +0100 |
| commit | 35defecc412aaa7231f4e141f93ebf362bffcd5c (patch) | |
| tree | 63a01b0bd6637f0112fe243d0dd62fb2374a095c /src/main/java/net | |
| parent | cdbd318bb5bad2c6941377a1d64f42f074c93df2 (diff) | |
| download | craftbukkit-35defecc412aaa7231f4e141f93ebf362bffcd5c.tar craftbukkit-35defecc412aaa7231f4e141f93ebf362bffcd5c.tar.gz craftbukkit-35defecc412aaa7231f4e141f93ebf362bffcd5c.tar.lz craftbukkit-35defecc412aaa7231f4e141f93ebf362bffcd5c.tar.xz craftbukkit-35defecc412aaa7231f4e141f93ebf362bffcd5c.zip | |
Fixed a couple of minor obf translations
Diffstat (limited to 'src/main/java/net')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityPlayer.java | 2 | ||||
| -rw-r--r-- | src/main/java/net/minecraft/server/ItemBlock.java | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index 74476d7d..1dbc1c49 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -174,7 +174,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { bworld.dropItemNaturally(bukkitEntity.getLocation(), stack); } - this.y(); + this.x(); // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java index c0598a2d..172e9ad6 100644 --- a/src/main/java/net/minecraft/server/ItemBlock.java +++ b/src/main/java/net/minecraft/server/ItemBlock.java @@ -114,8 +114,11 @@ public class ItemBlock extends Item { // CraftBukkit end - Block.byId[this.id].postPlace(world, i, j, k, l); - Block.byId[this.id].postPlace(world, i, j, k, entityhuman); + if (world.getTypeId(i, j, k) == this.id) { + Block.byId[this.id].postPlace(world, i, j, k, l); + Block.byId[this.id].postPlace(world, i, j, k, entityhuman); + } + world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), block.stepSound.getName(), (block.stepSound.getVolume1() + 1.0F) / 2.0F, block.stepSound.getVolume2() * 0.8F); --itemstack.count; } |