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

fixed issue 235

Browse source
This commit is contained in:
BetaSteward 2011-08-31 11:16:17 -04:00
parent 0d5f71635d
commit 0ce1b4b918
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage/src/mage/game/combat/Combat.java
View file

@ -397,6 +397,7 @@ public class Combat implements Serializable, Copyable<Combat> {
for (CombatGroup group : groups) {
if (group.attackers.contains(attackerId)) {
group.attackers.remove(attackerId);
group.attackerOrder.remove(attackerId);
Permanent creature = game.getPermanent(attackerId);
if (creature != null) {
creature.setAttacking(false);
@ -414,12 +415,12 @@ public class Combat implements Serializable, Copyable<Combat> {
for (CombatGroup group : groups) {
if (group.blockers.contains(blockerId)) {
group.blockers.remove(blockerId);
Permanent creature = game.getPermanent(blockerId);
if (creature != null)
creature.setBlocking(0);
return;
group.blockerOrder.remove(blockerId);
}
}
Permanent creature = game.getPermanent(blockerId);
if (creature != null)
creature.setBlocking(0);
}
@Override