From 4ce99aaa058375a3bd231c81cff17afba71d722b Mon Sep 17 00:00:00 2001
From: garbagemule <garbagemule@gmail.com>
Date: Mon, 7 Apr 2014 16:40:31 +0200
Subject: [PATCH] Return null before trying to add enchantments to null items.

---
 src/com/garbagemule/MobArena/util/ItemParser.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/com/garbagemule/MobArena/util/ItemParser.java b/src/com/garbagemule/MobArena/util/ItemParser.java
index 6a2e623..e82c08e 100644
--- a/src/com/garbagemule/MobArena/util/ItemParser.java
+++ b/src/com/garbagemule/MobArena/util/ItemParser.java
@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import com.garbagemule.MobArena.Messenger;
 import org.bukkit.DyeColor;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
@@ -142,11 +143,15 @@ public class ItemParser
                 result = withDataAndAmount(parts[0], parts[1], parts[2]);
                 break;
         }
-        
+        if (result == null || result.getTypeId() == 0) {
+            Messenger.warning("Failed to parse item: " + item);
+            return null;
+        }
+
         if (space.length == 2) {
             addEnchantments(result, space[1]);
         }
-        
+
         return result;
     }