From 895b87ae051bdbde3569595a0c54872c5558787c Mon Sep 17 00:00:00 2001 From: MagicBot Date: Sun, 13 Aug 2023 08:16:02 -0400 Subject: [PATCH] Class cleanup. Formatting, squiggles and unused code/variables. --- src/engine/gameManager/CombatManager.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/engine/gameManager/CombatManager.java b/src/engine/gameManager/CombatManager.java index 29c37fc0..7bccb83b 100644 --- a/src/engine/gameManager/CombatManager.java +++ b/src/engine/gameManager/CombatManager.java @@ -750,7 +750,7 @@ public enum CombatManager { //Handle Dodge passive - if (!passiveFired) { + if (!passiveFired) if (testPassive(ac, tarAc, "Dodge")) { if (!target.isAlive()) @@ -759,7 +759,6 @@ public enum CombatManager { sendPassiveDefenseMessage(ac, wb, target, MBServerStatics.COMBAT_SEND_DODGE, dpj, mainHand); passiveFired = true; } - } } //return if passive (Block, Parry, Dodge) fired @@ -981,10 +980,8 @@ public enum CombatManager { if (acItem == null || tarItem == null) return false; - Item tarOff = tarItem.getItemFromEquipped(2); - if (tarOff == null) return false; @@ -1006,7 +1003,6 @@ public enum CombatManager { return ib.getRange() > MBServerStatics.RANGED_WEAPON_RANGE; - } private static float calculateDamage(AbstractCharacter source, AbstractCharacter target, float minDamage, float maxDamage, DamageType damageType, Resists resists) {