github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 11:09:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed issue 314

Browse source
This commit is contained in:
BetaSteward 2011-10-25 21:43:59 -04:00
parent 517a0cae26
commit 21f9633486
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -416,6 +416,8 @@ public class Combat implements Serializable, Copyable<Combat> {
if (group.blockers.contains(blockerId)) { if (group.blockers.contains(blockerId)) {
group.blockers.remove(blockerId); group.blockers.remove(blockerId);
group.blockerOrder.remove(blockerId); group.blockerOrder.remove(blockerId);
if (group.blockers.isEmpty())
group.blocked = false;
} }
} }
Permanent creature = game.getPermanent(blockerId); Permanent creature = game.getPermanent(blockerId);

4
Mage/src/mage/game/combat/CombatGroup.java
View file

@ -484,12 +484,14 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
return defenderIsPlaneswalker; return defenderIsPlaneswalker;
} }
void remove(UUID creatureId) { public void remove(UUID creatureId) {
if (attackers.contains(creatureId)) { if (attackers.contains(creatureId)) {
attackers.remove(creatureId); attackers.remove(creatureId);
} }
if (blockers.contains(creatureId)) { if (blockers.contains(creatureId)) {
blockers.remove(creatureId); blockers.remove(creatureId);
if (blockers.isEmpty())
blocked = false;
//20100423 - 509.2a //20100423 - 509.2a
if (blockerOrder.contains(creatureId)) if (blockerOrder.contains(creatureId))
blockerOrder.remove(creatureId); blockerOrder.remove(creatureId);