diff options
author | Erik Broes <erikbroes@grum.nl> | 2011-05-28 22:50:08 +0200 |
---|---|---|
committer | EvilSeph <evilseph@unaligned.org> | 2011-05-30 22:37:34 -0400 |
commit | 6dbd710bbf37728eb760cacb019d1e384a7e1311 (patch) | |
tree | 37b670b6e589f3fcffa116d55c099e424402dfdc /src/main/java/net/minecraft/server/EntityItem.java | |
parent | 9ec5d8b5dfc544a6873aa1bb48a07deedd1751fb (diff) | |
download | craftbukkit-6dbd710bbf37728eb760cacb019d1e384a7e1311.tar craftbukkit-6dbd710bbf37728eb760cacb019d1e384a7e1311.tar.gz craftbukkit-6dbd710bbf37728eb760cacb019d1e384a7e1311.tar.lz craftbukkit-6dbd710bbf37728eb760cacb019d1e384a7e1311.tar.xz craftbukkit-6dbd710bbf37728eb760cacb019d1e384a7e1311.zip |
Update for 1.6.5
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityItem.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityItem.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java index 7472436b..c61ab3e0 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -38,8 +38,8 @@ public class EntityItem extends Entity { protected void b() {} - public void p_() { - super.p_(); + public void o_() { + super.o_(); if (this.pickupDelay > 0) { --this.pickupDelay; } @@ -55,7 +55,7 @@ public class EntityItem extends Entity { this.world.makeSound(this, "random.fizz", 0.4F, 2.0F + this.random.nextFloat() * 0.4F); } - this.g(this.locX, this.locY, this.locZ); + this.g(this.locX, (this.boundingBox.b + this.boundingBox.e) / 2.0D, this.locZ); this.move(this.motX, this.motY, this.motZ); float f = 0.98F; @@ -91,7 +91,7 @@ public class EntityItem extends Entity { } public boolean damageEntity(Entity entity, int i) { - this.ac(); + this.ae(); this.f -= i; if (this.f <= 0) { this.die(); |