toUppercase()

This commit is contained in:
2024-02-26 15:18:03 -05:00
parent 2e5fa69942
commit 1763266972
11 changed files with 17 additions and 14 deletions
+1 -1
View File
@@ -285,7 +285,7 @@ public class EffectsBase {
if (name.isEmpty())
return null;
else
return Enum.SourceType.valueOf(name);
return Enum.SourceType.valueOf(name.toUpperCase());
}
@@ -33,7 +33,7 @@ public class BlackMantleEffectModifier extends AbstractEffectModifier {
@Override
public void applyBonus(AbstractCharacter ac, int trains) {
PlayerBonuses bonus = ac.getBonuses();
SourceType sourceType = SourceType.valueOf(this.type);
SourceType sourceType = SourceType.valueOf(this.type.toUpperCase());
if (sourceType == null) {
Logger.error("Bad Source Type for " + this.type);
@@ -48,11 +48,14 @@ public class DamageShieldEffectModifier extends AbstractEffectModifier {
amount *= (1 + mod);
}
Enum.SourceType dt = Enum.SourceType.valueOf(this.type);
Enum.SourceType dt = Enum.SourceType.valueOf(this.type.toUpperCase());
if (dt != null) {
DamageShield ds = new DamageShield(dt, amount, usePercent);
PlayerBonuses bonus = ac.getBonuses();
if (bonus != null)
bonus.addDamageShield(this, ds);
}
@@ -33,10 +33,10 @@ public class HealthEffectModifier extends AbstractEffectModifier {
super(rs);
String damageTypeDB = rs.getString("type");
try {
this.damageType = SourceType.valueOf(damageTypeDB);
this.damageType = SourceType.valueOf(damageTypeDB.toUpperCase());
} catch (IllegalArgumentException e) {
Logger.error("DamageType could not be loaded from database. " + "UUID = " + this.UUID
+ " value received = '" + damageTypeDB + '\'', e);
+ " value received = '" + damageTypeDB.toUpperCase() + '\'', e);
}
}
@@ -37,10 +37,10 @@ public class ManaEffectModifier extends AbstractEffectModifier {
super(rs);
String damageTypeDB = rs.getString("type");
try {
this.damageType = SourceType.valueOf(damageTypeDB);
this.damageType = SourceType.valueOf(damageTypeDB.toUpperCase());
} catch (IllegalArgumentException e) {
Logger.error("DamageType could not be loaded from database. " + "UUID = " + this.UUID
+ " value received = '" + damageTypeDB + '\'', e);
+ " value received = '" + damageTypeDB.toUpperCase() + '\'', e);
}
}
@@ -37,10 +37,10 @@ public class StaminaEffectModifier extends AbstractEffectModifier {
super(rs);
String damageTypeDB = rs.getString("type");
try {
this.damageType = SourceType.valueOf(damageTypeDB);
this.damageType = SourceType.valueOf(damageTypeDB.toUpperCase());
} catch (IllegalArgumentException e) {
Logger.error("DamageType could not be loaded from database. " + "UUID = " + this.UUID
+ " value received = '" + damageTypeDB + '\'', e);
+ " value received = '" + damageTypeDB.toUpperCase() + '\'', e);
}
}
@@ -79,7 +79,7 @@ public class TransferStatPowerAction extends AbstractPowerAction {
// Damage type can sometimes be null in the DB.
if (damageString.isEmpty() == false)
this.damageType = SourceType.valueOf(damageString);
this.damageType = SourceType.valueOf(damageString.toUpperCase());
} catch (Exception e) {
this.damageType = null;
}