Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix loading Items entities with an invalid item. Addresses BUKKIT-3249

Browse Source
This commit is contained in:
feildmaster 2012-12-21 16:07:59 -06:00
parent 118682ce5c
commit f71be2506d
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/net/minecraft/server/EntityItem.java
View File

@ -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();
}