Updated to Minecraft 1.1

2012-01-12 23:10:13 +01:00
parent dd5ef8725c
commit 7219d4dd85
82 changed files with 1472 additions and 1687 deletions
--- 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();