Add better protection to modifier variable setting

Author: TheComputerGeek2

src/com/nisovin/magicspells/castmodifiers/conditions/MultiCondition.java

@@ -66,8 +66,14 @@ public boolean setVar(String var) {
 		if (modifierStrings == null) return false;
 
 		String passConditionString = config.getString(configPrefix + ".pass-condition", "ALL").toUpperCase();
-		PassCondition configPassCondition = PassCondition.valueOf(passConditionString);
-		if (configPassCondition != null) passCondition = configPassCondition;
+		try {
+			passCondition = PassCondition.valueOf(passConditionString);
+		} catch (IllegalArgumentException badPassCondition) {
+			MagicSpells.error("Invalid value for \"pass-condition\" of \"" + passConditionString + "\".");
+			// To preserve old behavior, just default it to "ALL"
+			MagicSpells.error("Defaulting pass-condition to \"ALL\"");
+			passCondition = PassCondition.ALL;
+		}
 
 		modifiers = new ArrayList<>();
 		for (String modString: modifierStrings) {

src/com/nisovin/magicspells/castmodifiers/conditions/SpellCastStateCondition.java

@@ -1,5 +1,6 @@
 package com.nisovin.magicspells.castmodifiers.conditions;
 
+import com.nisovin.magicspells.MagicSpells;
 import org.bukkit.Location;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -59,8 +60,13 @@ public boolean check(Player player) {
 	@Override
 	public boolean setVar(String var) {
 		if (var == null) return false;
-		this.state = SpellCastState.valueOf(var.trim().toUpperCase());
-		return this.state != null;
+		try {
+			this.state = SpellCastState.valueOf(var.trim().toUpperCase());
+			return true;
+		} catch (IllegalArgumentException badValueString) {
+			MagicSpells.error("Invalid SpellCastState of \"" + var.trim() + "\" on this modifier var");
+			return false;
+		}
 	}
 
 	@Override

src/com/nisovin/magicspells/castmodifiers/conditions/VariableEqualsCondition.java

@@ -23,6 +23,9 @@ public boolean setVar(String var) {
 		} catch (NumberFormatException e) {
 			DebugHandler.debugNumberFormat(e);
 			return false;
+		} catch (ArrayIndexOutOfBoundsException missingColon) {
+			MagicSpells.error("You likely forgot to add a colon in this modifier var.");
+			return false;
 		}
 	}
 

src/com/nisovin/magicspells/castmodifiers/conditions/VariableLessThanCondition.java

@@ -23,6 +23,9 @@ public boolean setVar(String var) {
 		} catch (NumberFormatException e) {
 			DebugHandler.debugNumberFormat(e);
 			return false;
+		} catch (ArrayIndexOutOfBoundsException missingColon) {
+			MagicSpells.error("You likely forgot to add a colon in this modifier var.");
+			return false;
 		}
 	}
 

src/com/nisovin/magicspells/castmodifiers/conditions/VariableMoreThanCondition.java

@@ -23,6 +23,9 @@ public boolean setVar(String var) {
 		} catch (NumberFormatException e) {
 			DebugHandler.debugNumberFormat(e);
 			return false;
+		} catch (ArrayIndexOutOfBoundsException missingColon) {
+			MagicSpells.error("You likely forgot to add a colon in this modifier var.");
+			return false;
 		}
 	}