[Bleeding] Fixed NullPointerException in InventoryView.setCursor() if you tried to empty the cursor by setting it to null. Fixes BUKKIT-1043

This commit is contained in:
Celtic Minstrel 2012-03-13 21:46:00 -04:00 committed by EvilSeph
parent 288662bfae
commit 93732e21bc

View File

@ -68,8 +68,8 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
}
public void setItemOnCursor(ItemStack item) {
CraftItemStack stack = new CraftItemStack(item);
getHandle().inventory.setCarried(stack.getHandle());
net.minecraft.server.ItemStack stack = CraftItemStack.createNMSItemStack(item);
getHandle().inventory.setCarried(stack);
if (this instanceof CraftPlayer) {
((EntityPlayer) getHandle()).broadcastCarriedItem(); // Send set slot for cursor
}