Use safer checks for biome parsing

Author: TheComputerGeek2

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

@@ -1,5 +1,6 @@
 package com.nisovin.magicspells.castmodifiers.conditions;
 
+import com.nisovin.magicspells.util.Util;
 import org.bukkit.Location;
 import org.bukkit.block.Biome;
 import org.bukkit.entity.LivingEntity;
@@ -8,20 +9,31 @@
 import com.nisovin.magicspells.DebugHandler;
 import com.nisovin.magicspells.castmodifiers.Condition;
 
-public class BiomeCondition extends Condition {
+import java.util.EnumSet;
 
-	Biome[] biomes;
+public class BiomeCondition extends Condition {
+	
+	private EnumSet<Biome> biomes = EnumSet.noneOf(Biome.class);
 
 	@Override
 	public boolean setVar(String var) {
 		String[] s = var.split(",");
-		biomes = new Biome[s.length];
 		for (int i = 0; i < s.length; i++) {
-			biomes[i] = Biome.valueOf(s[i].toUpperCase());
-			if (biomes[i] == null) {
+			
+			// Get the biome
+			Biome biome = Util.enumValueSafe(Biome.class, s[i].toUpperCase());
+			
+			// Is it null?
+			if (biome == null) {
+				// Rip...
 				DebugHandler.debugBadEnumValue(Biome.class, s[i].toUpperCase());
-				return false;
+				
+				// NEXT!
+				continue;
 			}
+			
+			// Add to the collection
+			biomes.add(biome);
 		}
 		return true;
 	}
@@ -38,11 +50,7 @@ public boolean check(Player player, LivingEntity target) {
 
 	@Override
 	public boolean check(Player player, Location location) {
-		Biome biome = location.getBlock().getBiome();
-		for (Biome b : biomes) {
-			if (b == biome) return true;
-		}
-		return false;
+		return biomes.contains(location.getBlock().getBiome());
 	}
 
 }

src/com/nisovin/magicspells/util/Util.java

@@ -790,4 +790,12 @@ public static <C extends Collection<Material>> C getMaterialList(List<String> st
 		return ret;
 	}
 
+	public static <E extends Enum<E>> E enumValueSafe(Class<E> clazz, String name) {
+		try {
+			return Enum.valueOf(clazz, name);
+		} catch (Exception e) {
+			return null;
+		}
+	}
+	
 }