Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-25 18:37:35 +01:00
Code Issues Projects Releases Wiki Activity

Add a null check for Item Entities. Fixes BUKKIT-3249

Browse Source
This commit is contained in:
feildmaster 2012-12-21 15:07:02 -06:00
parent b870755edb
commit e937307596
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,11 @@ public class EntityItem extends Entity {
public EntityItem(World world, double d0, double d1, double d2, ItemStack itemstack) { public EntityItem(World world, double d0, double d1, double d2, ItemStack itemstack) {
this(world, d0, d1, d2); this(world, d0, d1, d2);
// CraftBukkit start - Can't set null items in the datawatcher
if (itemstack == null || itemstack.getItem() == null) {
return;
}
// CraftBukkit end
this.setItemStack(itemstack); this.setItemStack(itemstack);
} }