Fix core error when given an invalid potion type (CMDHELPER-3172)

EngineHub · May 31, 2018 · 88a131a · 88a131a
1 parent 6cb2fb3
commit 88a131a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/com/laytonsmith/core/ObjectGenerator.java b/src/main/java/com/laytonsmith/core/ObjectGenerator.java
@@ -1168,7 +1168,12 @@ public CArray potionData(MCPotionData mcpd, Target t) {
 	}
 
 	public MCPotionData potionData(CArray pd, Target t) {
-		MCPotionType type = MCPotionType.valueOf(pd.get("type", t).val().toUpperCase());
+		MCPotionType type;
+		try {
+			type = MCPotionType.valueOf(pd.get("type", t).val().toUpperCase());
+		} catch(IllegalArgumentException ex) {
+			throw new CREFormatException("Invalid potion type: " + pd.get("type", t).val(), t);
+		}
 		boolean extended = false;
 		boolean upgraded = false;
 		if(pd.containsKey("extended")) {