From e4438072c26e5e07ffca62aaf0e08e810673cc0a Mon Sep 17 00:00:00 2001 From: North Date: Wed, 4 Jul 2012 23:57:33 +0300 Subject: [PATCH] [refactoring][minor] formatting --- .../ai/simulators/CombatGroupSimulator.java | 2 +- .../common/FilterCreaturePermanent.java | 51 ++++++++++--------- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/simulators/CombatGroupSimulator.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/simulators/CombatGroupSimulator.java index 115fa0c7751..026f7dac5b7 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/simulators/CombatGroupSimulator.java +++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/simulators/CombatGroupSimulator.java @@ -86,7 +86,7 @@ public class CombatGroupSimulator implements Serializable { } private void assignDamage(boolean first) { - if (blockers.size() == 0) { + if (blockers.isEmpty()) { if (canDamage(attacker, first)) unblockedDamage += attacker.power; } diff --git a/Mage/src/mage/filter/common/FilterCreaturePermanent.java b/Mage/src/mage/filter/common/FilterCreaturePermanent.java index 6ce0c9ef327..eb6622e0e65 100644 --- a/Mage/src/mage/filter/common/FilterCreaturePermanent.java +++ b/Mage/src/mage/filter/common/FilterCreaturePermanent.java @@ -43,8 +43,8 @@ public class FilterCreaturePermanent> exten protected boolean attacking; protected boolean useBlocking; protected boolean blocking; - protected boolean useDamageDealt; - protected boolean damageDealt; + protected boolean useDamageDealt; + protected boolean damageDealt; public FilterCreaturePermanent() { this("creature"); @@ -61,8 +61,8 @@ public class FilterCreaturePermanent> exten this.attacking = filter.attacking; this.useBlocking = filter.useBlocking; this.blocking = filter.blocking; - this.useDamageDealt = filter.useDamageDealt; - this.damageDealt = filter.damageDealt; + this.useDamageDealt = filter.useDamageDealt; + this.damageDealt = filter.damageDealt; this.useTapped = filter.useTapped; this.tapped = filter.tapped; } @@ -85,17 +85,18 @@ public class FilterCreaturePermanent> exten return notFilter; } } - return !notFilter; - } + return !notFilter; + } if (useBlocking && (permanent.getBlocking() > 0) != blocking) return notFilter; - if (useDamageDealt) { - // use this instead of getDamage() because damage is reset in case of regeneration - if (permanent.getDealtDamageByThisTurn().isEmpty()) - return notFilter; - } + if (useDamageDealt) { + // use this instead of getDamage() because damage is reset in case of regeneration + if (permanent.getDealtDamageByThisTurn().isEmpty()) { + return notFilter; + } + } return !notFilter; } @@ -114,21 +115,23 @@ public class FilterCreaturePermanent> exten public void setBlocking ( boolean blocking ) { this.blocking = blocking; } - /** - * Select creatures dependant if they already got damage - * during the current turn. Works also if the creature - * was meanwhile regenerated during the turn. - * - * @param useDamageDealt - */ - public void setUseDamageDealt ( boolean useDamageDealt ) { + + /** + * Select creatures dependant if they already got damage during the current turn. Works also if the creature was + * meanwhile regenerated during the turn. + * + * @param useDamageDealt + */ + public void setUseDamageDealt(boolean useDamageDealt) { this.useDamageDealt = useDamageDealt; } - /** - * Select creatures that got damage dealt to this turn. - * @param damageDealt - */ - public void setDamageDealt ( boolean damageDealt ) { + + /** + * Select creatures that got damage dealt to this turn. + * + * @param damageDealt + */ + public void setDamageDealt(boolean damageDealt) { this.damageDealt = damageDealt; }