Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

[refactoring][minor] formatting

Browse source
This commit is contained in:
North 2012-07-04 23:57:33 +03:00
parent 979571a2f2
commit e4438072c2
2 changed files with 28 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/simulators/CombatGroupSimulator.java
View file

@ -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;
}

51
Mage/src/mage/filter/common/FilterCreaturePermanent.java
View file

@ -43,8 +43,8 @@ public class FilterCreaturePermanent<T extends FilterCreaturePermanent<T>> 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<T extends FilterCreaturePermanent<T>> 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<T extends FilterCreaturePermanent<T>> 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<T extends FilterCreaturePermanent<T>> 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;
}