github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 11:05:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed Issue#29: It is possible to cancel creature attack even if it must attack

Browse source
This commit is contained in:
magenoxx 2012-07-26 18:47:04 +04:00
parent 33f9bfc101
commit 1eb230e236
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
View file

@ -36,6 +36,7 @@ import mage.abilities.*;
import mage.abilities.costs.common.SacrificeSourceCost;
import mage.abilities.costs.mana.*;
import mage.abilities.effects.ReplacementEffect;
import mage.abilities.effects.RequirementEffect;
import mage.abilities.mana.ManaAbility;
import mage.cards.Card;
import mage.cards.Cards;
@ -527,14 +528,22 @@ public class HumanPlayer extends PlayerImpl<HumanPlayer> {
selectDefender(game.getCombat().getDefenders(), attacker.getId(), game);
}
else if (filterAttack.match(attacker, null, playerId, game) && game.getStack().isEmpty()) {
// if (game.getState().getTriggered().isEmpty() && game.getState().getDelayed().isEmpty())
game.getCombat().removeAttacker(attacker.getId(), game);
removeAttackerIfPossible(game, attacker);
}
}
}
}
}
private void removeAttackerIfPossible(Game game, Permanent attacker) {
for (RequirementEffect effect : game.getContinuousEffects().getApplicableRequirementEffects(attacker, game)) {
if (effect.mustAttack(game)) {
return; // we can't cancel attacking
}
}
game.getCombat().removeAttacker(attacker.getId(), game);
}
protected boolean selectDefender(Set<UUID> defenders, UUID attackerId, Game game) {
if (defenders.size() == 1) {
declareAttacker(attackerId, defenders.iterator().next(), game);

BIN
Mage.Server/plugins/mage-player-human.jar
View file

Binary file not shown.