diff options
| author | Erik Broes <erikbroes@grum.nl> | 2012-01-12 23:10:13 +0100 |
|---|---|---|
| committer | Erik Broes <erikbroes@grum.nl> | 2012-01-12 23:10:13 +0100 |
| commit | 7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee (patch) | |
| tree | a1ca024b03aadf4b687f442b33bf713aecd511f7 /src/main/java/net/minecraft/server/EntityItem.java | |
| parent | dd5ef8725c699e0b2946dc0f6d523ca482404043 (diff) | |
| download | craftbukkit-7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee.tar craftbukkit-7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee.tar.gz craftbukkit-7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee.tar.lz craftbukkit-7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee.tar.xz craftbukkit-7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee.zip | |
Updated to Minecraft 1.1
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityItem.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityItem.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java index 5dd87b07..d314cef9 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -41,8 +41,8 @@ public class EntityItem extends Entity { protected void b() {} - public void w_() { - super.w_(); + public void y_() { + super.y_(); // CraftBukkit start int currentTick = (int) (System.currentTimeMillis() / 50); this.pickupDelay -= (currentTick - this.lastTick); @@ -96,7 +96,7 @@ public class EntityItem extends Entity { } public boolean damageEntity(DamageSource damagesource, int i) { - this.aB(); + this.aM(); this.f -= i; if (this.f <= 0) { this.die(); |