diff --git a/src/engine/gameManager/CombatManager.java b/src/engine/gameManager/CombatManager.java index 32367e01..a76f7280 100644 --- a/src/engine/gameManager/CombatManager.java +++ b/src/engine/gameManager/CombatManager.java @@ -555,6 +555,7 @@ public enum CombatManager { if (target == null) return; + if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)){ PlayerCharacter pc = (PlayerCharacter) ac; pc.combatStats.calculateATR(true); @@ -671,13 +672,13 @@ public enum CombatManager { } } else { AbstractCharacter tar = (AbstractCharacter) target; + handleRetaliate(tar, ac); //Handle target attacking back if in combat and has no other target if(tar.getObjectType().equals(GameObjectType.PlayerCharacter)){ ((PlayerCharacter)tar).combatStats.calculateDefense(); defense = ((PlayerCharacter)tar).combatStats.defense; }else { defense = tar.getDefenseRating(); } - handleRetaliate(tar, ac); //Handle target attacking back if in combat and has no other target } errorTrack = 4;