Upstream/MobArena
1
0
Fork 0
mirror of https://github.com/garbagemule/MobArena.git synced 2024-11-27 04:55:25 +01:00
Code Issues Projects Releases Wiki Activity

Return null before trying to add enchantments to null items.

Browse Source
This commit is contained in:
garbagemule 2014-04-07 16:40:31 +02:00
parent f96eb5ac47
commit 4ce99aaa05
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/garbagemule/MobArena/util/ItemParser.java
View File

@ -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;
}