From 042376d1467cf92358bdf9c3abd833b55256182a Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Tue, 29 Sep 2020 22:44:38 -0400 Subject: [PATCH] replaced hacky fix with a better one --- Mage/src/main/java/mage/game/combat/Combat.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Mage/src/main/java/mage/game/combat/Combat.java b/Mage/src/main/java/mage/game/combat/Combat.java index bbb822a9dd7..892a1f125c3 100644 --- a/Mage/src/main/java/mage/game/combat/Combat.java +++ b/Mage/src/main/java/mage/game/combat/Combat.java @@ -275,16 +275,15 @@ public class Combat implements Serializable, Copyable { attackingPermanent.tap(true, game); // to tap with event finally here is needed to prevent abusing of Vampire Envoy like cards } } - game.applyEffects(); handleBanding(attacker, game); // This can only be used to modify the event, the attack can't be replaced here game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.ATTACKER_DECLARED, group.defenderId, attacker, attackingPlayerId)); - game.fireEvent(GameEvent.getEvent(GameEvent.EventType.ATTACKER_DECLARED, group.defenderId, attacker, attackingPlayerId)); + game.addSimultaneousEvent(GameEvent.getEvent(GameEvent.EventType.ATTACKER_DECLARED, group.defenderId, attacker, attackingPlayerId)); } } attackersTappedByAttack.clear(); - game.fireEvent(GameEvent.getEvent(GameEvent.EventType.DECLARED_ATTACKERS, attackingPlayerId, attackingPlayerId)); + game.addSimultaneousEvent(GameEvent.getEvent(GameEvent.EventType.DECLARED_ATTACKERS, attackingPlayerId, attackingPlayerId)); if (!game.isSimulation()) { Player player = game.getPlayer(attackingPlayerId); if (player != null) {