Browse Source

Class cleanup. Formatting, squiggles and unused code/variables.

master
MagicBot 1 year ago
parent
commit
895b87ae05
  1. 6
      src/engine/gameManager/CombatManager.java

6
src/engine/gameManager/CombatManager.java

@ -750,7 +750,7 @@ public enum CombatManager {
//Handle Dodge passive //Handle Dodge passive
if (!passiveFired) { if (!passiveFired)
if (testPassive(ac, tarAc, "Dodge")) { if (testPassive(ac, tarAc, "Dodge")) {
if (!target.isAlive()) if (!target.isAlive())
@ -759,7 +759,6 @@ public enum CombatManager {
sendPassiveDefenseMessage(ac, wb, target, MBServerStatics.COMBAT_SEND_DODGE, dpj, mainHand); sendPassiveDefenseMessage(ac, wb, target, MBServerStatics.COMBAT_SEND_DODGE, dpj, mainHand);
passiveFired = true; passiveFired = true;
} }
}
} }
//return if passive (Block, Parry, Dodge) fired //return if passive (Block, Parry, Dodge) fired
@ -981,10 +980,8 @@ public enum CombatManager {
if (acItem == null || tarItem == null) if (acItem == null || tarItem == null)
return false; return false;
Item tarOff = tarItem.getItemFromEquipped(2); Item tarOff = tarItem.getItemFromEquipped(2);
if (tarOff == null) if (tarOff == null)
return false; return false;
@ -1006,7 +1003,6 @@ public enum CombatManager {
return ib.getRange() > MBServerStatics.RANGED_WEAPON_RANGE; return ib.getRange() > MBServerStatics.RANGED_WEAPON_RANGE;
} }
private static float calculateDamage(AbstractCharacter source, AbstractCharacter target, float minDamage, float maxDamage, DamageType damageType, Resists resists) { private static float calculateDamage(AbstractCharacter source, AbstractCharacter target, float minDamage, float maxDamage, DamageType damageType, Resists resists) {

Loading…
Cancel
Save