diff options
author | md_5 <git@md-5.net> | 2017-01-02 10:04:19 +1100 |
---|---|---|
committer | md_5 <git@md-5.net> | 2017-01-02 10:04:19 +1100 |
commit | 5715b3a6d98848d39c1e6bc6b0be6ba0ef8e2b76 (patch) | |
tree | 93c02fb68f02745bfe249e33b6c8384c0e780ccf /src/main/java/org | |
parent | e2a288c863b383397057b742e9289bc4c31e44d1 (diff) | |
download | craftbukkit-5715b3a6d98848d39c1e6bc6b0be6ba0ef8e2b76.tar craftbukkit-5715b3a6d98848d39c1e6bc6b0be6ba0ef8e2b76.tar.gz craftbukkit-5715b3a6d98848d39c1e6bc6b0be6ba0ef8e2b76.tar.lz craftbukkit-5715b3a6d98848d39c1e6bc6b0be6ba0ef8e2b76.tar.xz craftbukkit-5715b3a6d98848d39c1e6bc6b0be6ba0ef8e2b76.zip |
SPIGOT-2977: Pass setAmount(0) through to wrapped ItemStack.
This class needs to be rewritten with more consistent semantics and alignment with Minecraft losing null, but that is probably a job for 1.12
Diffstat (limited to 'src/main/java/org')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java index 8ed4b4bd..f12b67be 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -147,10 +147,10 @@ public final class CraftItemStack extends ItemStack { if (handle == null) { return; } + + handle.setCount(amount); if (amount == 0) { handle = null; - } else { - handle.setCount(amount); } } |