summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfeildmaster <admin@feildmaster.com>2012-05-31 10:15:00 -0500
committerfeildmaster <admin@feildmaster.com>2012-06-03 05:30:22 -0500
commite5200322051f0a4905012b08474b9225585f3e12 (patch)
treea46dd8d51e9e13e21de5055e8e56277accc6005f
parent13fcb9e37164740b7142c6cee8951bfd5e776e51 (diff)
downloadcraftbukkit-e5200322051f0a4905012b08474b9225585f3e12.tar
craftbukkit-e5200322051f0a4905012b08474b9225585f3e12.tar.gz
craftbukkit-e5200322051f0a4905012b08474b9225585f3e12.tar.lz
craftbukkit-e5200322051f0a4905012b08474b9225585f3e12.tar.xz
craftbukkit-e5200322051f0a4905012b08474b9225585f3e12.zip
Further improving ItemStack handling
-rw-r--r--src/main/java/net/minecraft/server/PlayerInventory.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/PlayerInventory.java b/src/main/java/net/minecraft/server/PlayerInventory.java
index d01be1e1..df502e88 100644
--- a/src/main/java/net/minecraft/server/PlayerInventory.java
+++ b/src/main/java/net/minecraft/server/PlayerInventory.java
@@ -439,6 +439,11 @@ public class PlayerInventory implements IInventory {
}
public ItemStack getCarried() {
+ // CraftBukkit start
+ if (this.f != null && this.f.count == 0) {
+ this.setCarried(null);
+ }
+ // CraftBukkit end
return this.f;
}