From 385ace970ee7b7912419d601b8a0867c4c2794df Mon Sep 17 00:00:00 2001
From: Nate Mortensen <nate.richard.mortensen@gmail.com>
Date: Thu, 20 Mar 2014 22:26:30 -0600
Subject: Update CraftBukkit to Minecraft 1.7.5

---
 src/main/java/net/minecraft/server/EntityItem.java | 26 ++++++++--------------
 1 file changed, 9 insertions(+), 17 deletions(-)

(limited to 'src/main/java/net/minecraft/server/EntityItem.java')

diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index bbcf6746..8343ac9f 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -73,7 +73,7 @@ public class EntityItem extends Entity {
             this.lastY = this.locY;
             this.lastZ = this.locZ;
             this.motY -= 0.03999999910593033D;
-            this.Y = this.j(this.locX, (this.boundingBox.b + this.boundingBox.e) / 2.0D, this.locZ);
+            this.X = this.j(this.locX, (this.boundingBox.b + this.boundingBox.e) / 2.0D, this.locZ);
             this.move(this.motX, this.motY, this.motZ);
             boolean flag = (int) this.lastX != (int) this.locX || (int) this.lastY != (int) this.locY || (int) this.lastZ != (int) this.locZ;
 
@@ -105,7 +105,7 @@ public class EntityItem extends Entity {
 
             // ++this.age; // CraftBukkit - Moved up
             if (!this.world.isStatic && this.age >= 6000) {
-                // CraftBukkit start
+                // CraftBukkit start - fire ItemDespawnEvent
                 if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
                     this.age = 0;
                     return;
@@ -164,7 +164,7 @@ public class EntityItem extends Entity {
         this.age = 4800;
     }
 
-    public boolean N() {
+    public boolean M() {
         return this.world.a(this.boundingBox, Material.WATER, (Entity) this);
     }
 
@@ -175,10 +175,10 @@ public class EntityItem extends Entity {
     public boolean damageEntity(DamageSource damagesource, float f) {
         if (this.isInvulnerable()) {
             return false;
-        } else if (this.getItemStack() != null && this.getItemStack().getItem() == Items.NETHER_STAR && damagesource.c()) {
+        } else if (this.getItemStack() != null && this.getItemStack().getItem() == Items.NETHER_STAR && damagesource.isExplosion()) {
             return false;
         } else {
-            this.Q();
+            this.P();
             this.e = (int) ((float) this.e - f);
             if (this.e <= 0) {
                 this.die();
@@ -217,7 +217,7 @@ public class EntityItem extends Entity {
 
         NBTTagCompound nbttagcompound1 = nbttagcompound.getCompound("Item");
 
-        // CraftBukkit start
+        // CraftBukkit start - Handle missing "Item" compounds
         if (nbttagcompound1 != null) {
             ItemStack itemstack = ItemStack.createStack(nbttagcompound1);
             if (itemstack != null) {
@@ -239,7 +239,7 @@ public class EntityItem extends Entity {
             ItemStack itemstack = this.getItemStack();
             int i = itemstack.count;
 
-            // CraftBukkit start
+            // CraftBukkit start - fire PlayerPickupItemEvent
             int canHold = entityhuman.inventory.canHold(itemstack);
             int remaining = itemstack.count - canHold;
 
@@ -301,7 +301,7 @@ public class EntityItem extends Entity {
         return LocaleI18n.get("item." + this.getItemStack().a());
     }
 
-    public boolean av() {
+    public boolean au() {
         return false;
     }
 
@@ -315,15 +315,7 @@ public class EntityItem extends Entity {
     public ItemStack getItemStack() {
         ItemStack itemstack = this.getDataWatcher().getItemStack(10);
 
-        if (itemstack == null) {
-            if (this.world != null) {
-                d.error("Item entity " + this.getId() + " has no item?!");
-            }
-
-            return new ItemStack(Blocks.STONE);
-        } else {
-            return itemstack;
-        }
+        return itemstack == null ? new ItemStack(Blocks.STONE) : itemstack; 
     }
 
     public void setItemStack(ItemStack itemstack) {
-- 
cgit v1.2.3