All damage type lookups go through method

This commit is contained in:
2024-04-01 12:35:44 -04:00
parent 14ee83e147
commit 5ed497dd69
7 changed files with 7 additions and 7 deletions
+1 -1
View File
@@ -227,7 +227,7 @@ public class ItemTemplate {
if (weapon_damage.isEmpty() == false)
for (Object o : weapon_damage) {
JSONObject damage_entry = (JSONObject) o;
Enum.DamageType damageType = Enum.DamageType.valueOf(((String) damage_entry.get("damage_type")));
Enum.DamageType damageType = Enum.DamageType.GetDamageType(((String) damage_entry.get("damage_type")));
int min = ((Long) damage_entry.get("damage_min")).intValue();
int max = ((Long) damage_entry.get("damage_max")).intValue();
int[] minMax = {min, max};
+1 -1
View File
@@ -135,7 +135,7 @@ public class Resists {
//Test if Damagetype is valid for foritude
private static boolean isValidDamageCapType(HashSet<SourceType> forts, Enum.DamageType damageType, boolean exclusive) {
for (SourceType fort : forts) {
Enum.DamageType dt = Enum.DamageType.valueOf(fort.name());
Enum.DamageType dt = Enum.DamageType.GetDamageType(fort.name());
if (dt.equals(Enum.DamageType.NONE))
continue;