From f71be2506dea09ce405e8f961fb1e2290c168f3f Mon Sep 17 00:00:00 2001 From: feildmaster Date: Fri, 21 Dec 2012 16:07:59 -0600 Subject: Fix loading Items entities with an invalid item. Addresses BUKKIT-3249 --- src/main/java/net/minecraft/server/EntityItem.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/main') diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java index 0b139a62..1cb66dfe 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -195,7 +195,18 @@ public class EntityItem extends Entity { this.age = nbttagcompound.getShort("Age"); NBTTagCompound nbttagcompound1 = nbttagcompound.getCompound("Item"); - this.setItemStack(ItemStack.a(nbttagcompound1)); + // CraftBukkit start + if (nbttagcompound1 != null) { + ItemStack itemstack = ItemStack.a(nbttagcompound1); + if (itemstack != null) { + this.setItemStack(itemstack); + } else { + this.die(); + } + } else { + this.die(); + } + // CraftBukkit end if (this.getItemStack() == null) { this.die(); } -- cgit v1.2.3