github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 11:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed can't attack alone ability (issue #119), creature wasn't untapped when attack was reverted.

Browse source
This commit is contained in:
LevelX2 2013-03-05 22:01:01 +01:00
parent 03402fd539
commit 2409e229c0
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/mage/abilities/keyword/CantAttackAloneAbility.java
View file

@ -55,7 +55,7 @@ public class CantAttackAloneAbility extends StaticAbility<CantAttackAloneAbility
@Override @Override
public String getRule() { public String getRule() {
return "Can't attack alone"; return "{this} can't attack alone.";
} }
@Override @Override

2
Mage/src/mage/abilities/keyword/CantBlockAloneAbility.java
View file

@ -55,7 +55,7 @@ public class CantBlockAloneAbility extends StaticAbility<CantBlockAloneAbility>
@Override @Override
public String getRule() { public String getRule() {
return "Can't block alone"; return "{this} can't block alone.";
} }
@Override @Override

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

@ -177,8 +177,8 @@ public class Combat implements Serializable, Copyable<Combat> {
count += group.getAttackers().size(); count += group.getAttackers().size();
} }
if (count == 1) { if (count == 1) {
List<UUID> tobeRemoved = new ArrayList<UUID>();
for (CombatGroup group: groups) { for (CombatGroup group: groups) {
List<UUID> tobeRemoved = new ArrayList<UUID>();
for (UUID attackingCreatureId: group.getAttackers()) { for (UUID attackingCreatureId: group.getAttackers()) {
Permanent attacker = game.getPermanent(attackingCreatureId); Permanent attacker = game.getPermanent(attackingCreatureId);
if (attacker != null && attacker.getAbilities().containsKey(CantAttackAloneAbility.getInstance().getId())) { if (attacker != null && attacker.getAbilities().containsKey(CantAttackAloneAbility.getInstance().getId())) {
@ -186,10 +186,11 @@ public class Combat implements Serializable, Copyable<Combat> {
tobeRemoved.add(attackingCreatureId); tobeRemoved.add(attackingCreatureId);
} }
} }
for (UUID attackingCreatureId : tobeRemoved) {
group.remove(attackingCreatureId);
}
} }
for (UUID attackingCreatureId : tobeRemoved) {
this.removeAttacker(attackingCreatureId, game);
}
} }
} }

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

@ -499,12 +499,9 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
toBeRemoved.add(blockerId); toBeRemoved.add(blockerId);
} }
} }
for (UUID blockerId : toBeRemoved) { for (UUID blockerId : toBeRemoved) {
remove(blockerId); game.getCombat().removeBlocker(blockerId, game);
Permanent creature = game.getPermanent(blockerId);
if (creature != null) {
creature.setBlocking(creature.getBlocking() - 1);
}
} }
if (blockers.isEmpty()) { if (blockers.isEmpty()) {
this.blocked = false; this.blocked = false;