summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrew Ardill <andrew.ardill@gmail.com>2011-12-29 22:31:55 +1100
committerAndrew Ardill <andrew.ardill@gmail.com>2011-12-29 22:44:58 +1100
commit60a2d1225058f6fe8123f182463e317a328b89a5 (patch)
treeccf3eeab41ca7a787bd0e8fcb283f9abaac4a1a0 /src
parent5124f8f4626a49726f740749865837e8d671c248 (diff)
downloadcraftbukkit-60a2d1225058f6fe8123f182463e317a328b89a5.tar
craftbukkit-60a2d1225058f6fe8123f182463e317a328b89a5.tar.gz
craftbukkit-60a2d1225058f6fe8123f182463e317a328b89a5.tar.lz
craftbukkit-60a2d1225058f6fe8123f182463e317a328b89a5.tar.xz
craftbukkit-60a2d1225058f6fe8123f182463e317a328b89a5.zip
CraftItemStack: Make sure this.item is not null when cloning.
Fixes BUKKIT-424
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index c0854276..b1bde111 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -212,7 +212,7 @@ public class CraftItemStack extends ItemStack {
@Override
public CraftItemStack clone() {
- return new CraftItemStack(this.item.cloneItemStack());
+ return new CraftItemStack(this.item == null ? this.item : this.item.cloneItemStack());
}
public static net.minecraft.server.ItemStack createNMSItemStack(ItemStack original) {