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

defense calc null checks

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-02-25 21:11:49 -06:00
parent bfd89036b2
commit 16a0b9c0e3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/mobileAI/utilities/CombatUtilities.java
+2
View File
@@ -156,6 +156,8 @@ public class CombatUtilities {
switch (target.getObjectType()) { switch (target.getObjectType()) {
case PlayerCharacter: case PlayerCharacter:
PlayerCharacter pc = (PlayerCharacter)target; PlayerCharacter pc = (PlayerCharacter)target;
if(pc.combatStats == null)
pc.combatStats = new PlayerCombatStats(pc);
pc.combatStats.calculateDefense(); pc.combatStats.calculateDefense();
defense = pc.combatStats.defense; defense = pc.combatStats.defense;
break; break;
src/engine/objects/PlayerCombatStats.java
+3 -3
View File
@@ -850,7 +850,7 @@ public class PlayerCombatStats {
if(this.owner.charItemManager != null){ if(this.owner.charItemManager != null){
if(this.owner.charItemManager.getEquipped(7) != null){ if(this.owner.charItemManager.getEquipped(7) != null){
for(String effID : this.owner.charItemManager.getEquipped(7).effects.keySet()) { for(String effID : this.owner.charItemManager.getEquipped(7).effects.keySet()) {
for (AbstractEffectModifier mod : this.owner.effects.get(effID).getEffectModifiers()) { for (AbstractEffectModifier mod : this.owner.charItemManager.getEquipped(7).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();
@@ -866,7 +866,7 @@ public class PlayerCombatStats {
//left ring //left ring
if(this.owner.charItemManager.getEquipped(8) != null){ if(this.owner.charItemManager.getEquipped(8) != null){
for(String effID : this.owner.charItemManager.getEquipped(8).effects.keySet()) { for(String effID : this.owner.charItemManager.getEquipped(8).effects.keySet()) {
for (AbstractEffectModifier mod : this.owner.effects.get(effID).getEffectModifiers()) { for (AbstractEffectModifier mod : this.owner.charItemManager.getEquipped(8).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();
@@ -882,7 +882,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.effects.get(effID).getEffectModifiers()) { for (AbstractEffectModifier mod : this.owner.charItemManager.getEquipped(8).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();