From 11009b4fc2c576ac82c8e30dbc21a8e8cf8bb605 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 25 Apr 2015 16:12:11 +0100 Subject: [PATCH] Setting an entity's shedding item to an empty value while not setting the rate to -1 will no longer crash the game when opening that entity's page in the shedding entry. Closes #813. Note to SoundLogic, java strings aren't comparable with != --- .../vazkii/botania/common/core/handler/SheddingHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java index 38756e454..aef3cbdd6 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -116,15 +116,15 @@ public final class SheddingHandler { lexiconSize = defaultPattern.lexiconSize; } - Property prop=config.get("Shedding", key + ".item", itemName); + Property prop = config.get("Shedding", key + ".item", itemName); prop.comment = "Configuration of Shedding for "+key; itemName = prop.getString(); rate = config.get("Shedding", key + ".rate", rate).getInt(); metadata = config.get("Shedding", key + ".metadata", metadata).getInt(); lexiconSize = config.get("Shedding", key + ".lexiconDisplaySize", lexiconSize).getInt(); - if(itemName != "" && rate != -1) - patterns.add(new ShedPattern((Class)EntityList.stringToClassMapping.get(key), new ItemStack((Item) Item.itemRegistry.getObject(itemName), 1, metadata), rate, lexiconSize)); + if(itemName != null && !itemName.isEmpty() && rate != -1) + patterns.add(new ShedPattern((Class) EntityList.stringToClassMapping.get(key), new ItemStack((Item) Item.itemRegistry.getObject(itemName), 1, metadata), rate, lexiconSize)); } public static class ShedPattern {