mele attack null checks

This commit is contained in:
2025-02-26 07:22:53 -06:00
parent aab28cd68c
commit 755d89ebe0
+5 -1
View File
@@ -776,6 +776,7 @@ public class PlayerCombatStats {
blockSkill = this.owner.skills.get("Block").getModifiedAmount(); blockSkill = this.owner.skills.get("Block").getModifiedAmount();
float shieldDefense = 0.0f; float shieldDefense = 0.0f;
try {
if (this.owner.charItemManager.getEquipped(2) != null && this.owner.charItemManager.getEquipped(2).getItemBase().isShield()) { if (this.owner.charItemManager.getEquipped(2) != null && this.owner.charItemManager.getEquipped(2).getItemBase().isShield()) {
Item shield = this.owner.charItemManager.getEquipped(2); Item shield = this.owner.charItemManager.getEquipped(2);
shieldDefense += shield.getItemBase().getDefense(); shieldDefense += shield.getItemBase().getDefense();
@@ -787,6 +788,9 @@ public class PlayerCombatStats {
} }
} }
} }
}catch(Exception ignore){
}
float weaponSkill = 0.0f; float weaponSkill = 0.0f;
float masterySkill = 0.0f; float masterySkill = 0.0f;
@@ -882,7 +886,7 @@ public class PlayerCombatStats {
//necklace //necklace
if(this.owner.charItemManager.getEquipped(9) != null){ if(this.owner.charItemManager.getEquipped(9) != null){
for(String effID : this.owner.charItemManager.getEquipped(9).effects.keySet()) { for(String effID : this.owner.charItemManager.getEquipped(9).effects.keySet()) {
for (AbstractEffectModifier mod : this.owner.charItemManager.getEquipped(8).effects.get(effID).getEffectModifiers()) { for (AbstractEffectModifier mod : this.owner.charItemManager.getEquipped(9).effects.get(effID).getEffectModifiers()) {
if (mod.modType.equals(Enum.ModType.DCV)) { if (mod.modType.equals(Enum.ModType.DCV)) {
if (mod.getPercentMod() == 0) { if (mod.getPercentMod() == 0) {
float value = mod.getMinMod(); float value = mod.getMinMod();