summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorEvilSeph <evilseph@gmail.com>2012-03-10 15:54:10 -0500
committerEvilSeph <evilseph@gmail.com>2012-03-10 15:54:10 -0500
commitf5348635522112c32793ebc2391985bf7031e8e0 (patch)
tree5452ba59acf7724308eb9c4461f81e826825e496 /src/main/java
parent68c89fcac94adb98aae752711e1fafc3fcae9d4c (diff)
downloadcraftbukkit-f5348635522112c32793ebc2391985bf7031e8e0.tar
craftbukkit-f5348635522112c32793ebc2391985bf7031e8e0.tar.gz
craftbukkit-f5348635522112c32793ebc2391985bf7031e8e0.tar.lz
craftbukkit-f5348635522112c32793ebc2391985bf7031e8e0.tar.xz
craftbukkit-f5348635522112c32793ebc2391985bf7031e8e0.zip
Make setting slots to AIR set them to null. Addresses BUKKIT-1043
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index 10e06b83..3d1f27e3 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -69,7 +69,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
public void setItemOnCursor(ItemStack item) {
CraftItemStack stack = new CraftItemStack(item.getType(), item.getAmount(), item.getDurability());
- getHandle().inventory.setCarried(stack.getHandle());
+ getHandle().inventory.setCarried(stack.getType() == Material.AIR ? null : stack.getHandle());
if (this instanceof CraftPlayer) {
((EntityPlayer) getHandle()).broadcastCarriedItem(); // Send set slot for cursor
}