diff --git a/src/engine/mbEnums.java b/src/engine/mbEnums.java index 207e92cb..8d085131 100644 --- a/src/engine/mbEnums.java +++ b/src/engine/mbEnums.java @@ -843,34 +843,26 @@ public class mbEnums { public static DamageType getDamageType(String modName) { + String name; + if (modName.isEmpty()) return DamageType.NONE; - if(modName.toLowerCase().equals("blind")) - modName = "BLINDNESS"; + // Client and DB strings vary in case and punctuation ("Fire", "Anti-Siege") - if(modName.toLowerCase().equals("powerblock")) - modName = "POWERINHIBITOR"; + name = modName.replaceAll("[\\s,-]", "").toUpperCase(); - //validity check for not looking up damage type that doesn't exist - boolean valid = false; - for(DamageType type : DamageType.values()){ - if(type.name().equals(modName)) - valid = true; - } + if (name.equals("BLIND")) + name = "BLINDNESS"; - if(!valid) - return DamageType.NONE; + if (name.equals("POWERBLOCK")) + name = "POWERINHIBITOR"; - DamageType damageType; + for (DamageType type : DamageType.values()) + if (type.name().equals(name)) + return type; - try { - damageType = DamageType.valueOf(modName.replace(",", "").toUpperCase()); - } catch (Exception e) { - Logger.error(e); - return DamageType.NONE; - } - return damageType; + return DamageType.NONE; } }