1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index c26cc412..9f7f0045 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -228,6 +228,8 @@ public class CraftItemStack extends ItemStack {
     public static net.minecraft.server.ItemStack createNMSItemStack(ItemStack original) {
         if (original == null || original.getTypeId() <= 0) {
             return null;
+        } else if (original instanceof CraftItemStack) {
+            return ((CraftItemStack) original).getHandle();
         }
         return new CraftItemStack(original).getHandle();
     }