Browse Source

defense calc null checks

lakebane-jobs
FatBoy-DOTC 2 days ago
parent
commit
16a0b9c0e3
  1. 2
      src/engine/mobileAI/utilities/CombatUtilities.java
  2. 6
      src/engine/objects/PlayerCombatStats.java

2
src/engine/mobileAI/utilities/CombatUtilities.java

@ -156,6 +156,8 @@ public class CombatUtilities { @@ -156,6 +156,8 @@ public class CombatUtilities {
switch (target.getObjectType()) {
case PlayerCharacter:
PlayerCharacter pc = (PlayerCharacter)target;
if(pc.combatStats == null)
pc.combatStats = new PlayerCombatStats(pc);
pc.combatStats.calculateDefense();
defense = pc.combatStats.defense;
break;

6
src/engine/objects/PlayerCombatStats.java

@ -850,7 +850,7 @@ public class PlayerCombatStats { @@ -850,7 +850,7 @@ public class PlayerCombatStats {
if(this.owner.charItemManager != null){
if(this.owner.charItemManager.getEquipped(7) != null){
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.getPercentMod() == 0) {
float value = mod.getMinMod();
@ -866,7 +866,7 @@ public class PlayerCombatStats { @@ -866,7 +866,7 @@ public class PlayerCombatStats {
//left ring
if(this.owner.charItemManager.getEquipped(8) != null){
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.getPercentMod() == 0) {
float value = mod.getMinMod();
@ -882,7 +882,7 @@ public class PlayerCombatStats { @@ -882,7 +882,7 @@ public class PlayerCombatStats {
//necklace
if(this.owner.charItemManager.getEquipped(9) != null){
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.getPercentMod() == 0) {
float value = mod.getMinMod();

Loading…
Cancel
Save