forked from MagicBane/Server
toUppercase()
This commit is contained in:
@@ -132,7 +132,7 @@ public class ItemBase {
|
||||
this.requiredDiscs = DbManager.parseEnumSet(rs.getString("disc_required"), Enum.DisciplineType.class);
|
||||
|
||||
this.mastery = rs.getString("mastery");
|
||||
damageType = Enum.SourceType.valueOf(rs.getString("damageType"));
|
||||
damageType = Enum.SourceType.valueOf(rs.getString("damageType").toUpperCase());
|
||||
|
||||
this.twoHanded = (rs.getInt("twoHanded") == 1);
|
||||
|
||||
|
||||
@@ -169,7 +169,7 @@ public class ItemTemplate {
|
||||
|
||||
for (Object o : weapon_damage) {
|
||||
JSONObject damage_entry = (JSONObject) o;
|
||||
item_weapon_damage_type = Enum.SourceType.valueOf((String) damage_entry.get("damage_type"));
|
||||
item_weapon_damage_type = Enum.SourceType.valueOf(((String) damage_entry.get("damage_type")).toUpperCase());
|
||||
item_weapon_damage_min = ((Long) damage_entry.get("damage_min")).intValue();
|
||||
item_weapon_damage_max = ((Long) damage_entry.get("damage_max")).intValue();
|
||||
}
|
||||
|
||||
@@ -136,7 +136,7 @@ public class Resists {
|
||||
//Test if Damagetype is valid for foritude
|
||||
private static boolean isValidDamageCapType(HashSet<SourceType> forts, SourceType damageType, boolean exclusive) {
|
||||
for (SourceType fort : forts) {
|
||||
SourceType dt = SourceType.valueOf(fort.name());
|
||||
SourceType dt = SourceType.valueOf(fort.name().toUpperCase());
|
||||
|
||||
if (dt == SourceType.NONE)
|
||||
continue;
|
||||
|
||||
Reference in New Issue
Block a user