MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

mele attack null checks

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-02-26 07:22:53 -06:00
parent aab28cd68c
commit 755d89ebe0
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/PlayerCombatStats.java
+9 -5
View File
@@ -776,17 +776,21 @@ 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;
if(this.owner.charItemManager.getEquipped(2) != null && this.owner.charItemManager.getEquipped(2).getItemBase().isShield()){ try {
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();
for(Effect eff : shield.effects.values()){ for (Effect eff : shield.effects.values()) {
for(AbstractEffectModifier mod : eff.getEffectModifiers()){ for (AbstractEffectModifier mod : eff.getEffectModifiers()) {
if(mod.modType.equals(Enum.ModType.DR)){ if (mod.modType.equals(Enum.ModType.DR)) {
shieldDefense += mod.minMod + (mod.getRamp() * eff.getTrains()); shieldDefense += mod.minMod + (mod.getRamp() * eff.getTrains());
} }
} }
} }
} }
}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();