All damage type lookups go through method
This commit is contained in:
@@ -227,7 +227,7 @@ public class ItemTemplate {
|
|||||||
if (weapon_damage.isEmpty() == false)
|
if (weapon_damage.isEmpty() == false)
|
||||||
for (Object o : weapon_damage) {
|
for (Object o : weapon_damage) {
|
||||||
JSONObject damage_entry = (JSONObject) o;
|
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 min = ((Long) damage_entry.get("damage_min")).intValue();
|
||||||
int max = ((Long) damage_entry.get("damage_max")).intValue();
|
int max = ((Long) damage_entry.get("damage_max")).intValue();
|
||||||
int[] minMax = {min, max};
|
int[] minMax = {min, max};
|
||||||
|
|||||||
@@ -135,7 +135,7 @@ public class Resists {
|
|||||||
//Test if Damagetype is valid for foritude
|
//Test if Damagetype is valid for foritude
|
||||||
private static boolean isValidDamageCapType(HashSet<SourceType> forts, Enum.DamageType damageType, boolean exclusive) {
|
private static boolean isValidDamageCapType(HashSet<SourceType> forts, Enum.DamageType damageType, boolean exclusive) {
|
||||||
for (SourceType fort : forts) {
|
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))
|
if (dt.equals(Enum.DamageType.NONE))
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ public class DamageShieldEffectModifier extends AbstractEffectModifier {
|
|||||||
amount *= (1 + mod);
|
amount *= (1 + mod);
|
||||||
}
|
}
|
||||||
|
|
||||||
Enum.DamageType dt = Enum.DamageType.valueOf(this.type);
|
Enum.DamageType dt = Enum.DamageType.GetDamageType(this.type);
|
||||||
|
|
||||||
if (dt != null) {
|
if (dt != null) {
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ public class HealthEffectModifier extends AbstractEffectModifier {
|
|||||||
super(rs);
|
super(rs);
|
||||||
String damageTypeDB = rs.getString("type");
|
String damageTypeDB = rs.getString("type");
|
||||||
try {
|
try {
|
||||||
this.damageType = Enum.DamageType.valueOf(damageTypeDB);
|
this.damageType = Enum.DamageType.GetDamageType(damageTypeDB);
|
||||||
} catch (IllegalArgumentException e) {
|
} catch (IllegalArgumentException e) {
|
||||||
Logger.error("DamageType could not be loaded from database. " + "UUID = " + this.UUID
|
Logger.error("DamageType could not be loaded from database. " + "UUID = " + this.UUID
|
||||||
+ " value received = '" + damageTypeDB.toUpperCase() + '\'', e);
|
+ " value received = '" + damageTypeDB.toUpperCase() + '\'', e);
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ public class ManaEffectModifier extends AbstractEffectModifier {
|
|||||||
super(rs);
|
super(rs);
|
||||||
String damageTypeDB = rs.getString("type");
|
String damageTypeDB = rs.getString("type");
|
||||||
try {
|
try {
|
||||||
this.damageType = Enum.DamageType.valueOf(damageTypeDB);
|
this.damageType = Enum.DamageType.GetDamageType(damageTypeDB);
|
||||||
} catch (IllegalArgumentException e) {
|
} catch (IllegalArgumentException e) {
|
||||||
Logger.error("DamageType could not be loaded from database. " + "UUID = " + this.UUID
|
Logger.error("DamageType could not be loaded from database. " + "UUID = " + this.UUID
|
||||||
+ " value received = '" + damageTypeDB.toUpperCase() + '\'', e);
|
+ " value received = '" + damageTypeDB.toUpperCase() + '\'', e);
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ public class StaminaEffectModifier extends AbstractEffectModifier {
|
|||||||
super(rs);
|
super(rs);
|
||||||
String damageTypeDB = rs.getString("type");
|
String damageTypeDB = rs.getString("type");
|
||||||
try {
|
try {
|
||||||
this.damageType = Enum.DamageType.valueOf(damageTypeDB);
|
this.damageType = Enum.DamageType.GetDamageType(damageTypeDB);
|
||||||
} catch (IllegalArgumentException e) {
|
} catch (IllegalArgumentException e) {
|
||||||
Logger.error("DamageType could not be loaded from database. " + "UUID = " + this.UUID
|
Logger.error("DamageType could not be loaded from database. " + "UUID = " + this.UUID
|
||||||
+ " value received = '" + damageTypeDB.toUpperCase() + '\'', e);
|
+ " value received = '" + damageTypeDB.toUpperCase() + '\'', e);
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ public class TransferStatPowerAction extends AbstractPowerAction {
|
|||||||
// Damage type can sometimes be null in the DB.
|
// Damage type can sometimes be null in the DB.
|
||||||
|
|
||||||
if (damageString.isEmpty() == false)
|
if (damageString.isEmpty() == false)
|
||||||
this.damageType = Enum.DamageType.valueOf(damageString);
|
this.damageType = Enum.DamageType.GetDamageType(damageString);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
this.damageType = null;
|
this.damageType = null;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user