diff --git a/src/engine/gameManager/NPCManager.java b/src/engine/gameManager/NPCManager.java index b3bcc485..b97e9b33 100644 --- a/src/engine/gameManager/NPCManager.java +++ b/src/engine/gameManager/NPCManager.java @@ -427,9 +427,9 @@ public enum NPCManager { for (MobEquipment equipped : mob.equip.values()) { if (equipped.template.item_type.equals(Enum.ItemType.ARMOR)) { - mob.resists.setResist(Enum.SourceType.SLASHING, mob.resists.getResist(Enum.SourceType.SLASHING, 0) + equipped.template.combat_attack_resist.get("Slashing")); - mob.resists.setResist(Enum.SourceType.CRUSHING, mob.resists.getResist(Enum.SourceType.CRUSHING, 0) + equipped.template.combat_attack_resist.get("Crushing")); - mob.resists.setResist(Enum.SourceType.PIERCING, mob.resists.getResist(Enum.SourceType.PIERCING, 0) + equipped.template.combat_attack_resist.get("Piercing")); + mob.resists.setResist(Enum.SourceType.SLASHING, mob.resists.getResist(Enum.SourceType.SLASHING, 0) + equipped.template.combat_attack_resist.get("SLASHING")); + mob.resists.setResist(Enum.SourceType.CRUSHING, mob.resists.getResist(Enum.SourceType.CRUSHING, 0) + equipped.template.combat_attack_resist.get("CRUSHING")); + mob.resists.setResist(Enum.SourceType.PIERCING, mob.resists.getResist(Enum.SourceType.PIERCING, 0) + equipped.template.combat_attack_resist.get("PIERCING")); } } } diff --git a/src/engine/objects/Resists.java b/src/engine/objects/Resists.java index 562b6eb1..2449c208 100644 --- a/src/engine/objects/Resists.java +++ b/src/engine/objects/Resists.java @@ -164,9 +164,9 @@ public class Resists { return phys; if (armor.template.item_type.equals(Enum.ItemType.ARMOR)) { - phys[0] += armor.template.combat_attack_resist.get("Slashing"); - phys[1] += armor.template.combat_attack_resist.get("Crushing"); - phys[2] += armor.template.combat_attack_resist.get("Piercing"); + phys[0] += armor.template.combat_attack_resist.get("SLASHING"); + phys[1] += armor.template.combat_attack_resist.get("CRUSHING"); + phys[2] += armor.template.combat_attack_resist.get("PIERCING"); } return phys;