summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityItem.java
diff options
context:
space:
mode:
authorNathan Adams <dinnerbone@dinnerbone.com>2012-03-22 20:39:39 +0000
committerNathan Adams <dinnerbone@dinnerbone.com>2012-03-22 20:39:39 +0000
commit9d09e7d0167326d4169f734e4b6d04c54d767507 (patch)
tree898333912891b9c35a63994242fbd55d5b6ac2c6 /src/main/java/net/minecraft/server/EntityItem.java
parent8dc7417a3d5c1af1e6434dc54952cfd5a8e90688 (diff)
downloadcraftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar
craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar.gz
craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar.lz
craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar.xz
craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.zip
Updated to Minecraft version 1.2.4. Updated version string to 1.2.4-R0.1.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityItem.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityItem.java6
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 a7750ac0..689f5409 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -46,8 +46,8 @@ public class EntityItem extends Entity {
protected void b() {}
- public void G_() {
- super.G_();
+ public void F_() {
+ super.F_();
// CraftBukkit start
int currentTick = (int) (System.currentTimeMillis() / 50);
this.pickupDelay -= (currentTick - this.lastTick);
@@ -110,7 +110,7 @@ public class EntityItem extends Entity {
}
public boolean damageEntity(DamageSource damagesource, int i) {
- this.aV();
+ this.aW();
this.e -= i;
if (this.e <= 0) {
this.die();