diff --git a/forge-game/src/main/java/forge/game/ability/effects/ExploreEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ExploreEffect.java index 7638aeeb553..30c69e02e27 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ExploreEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ExploreEffect.java @@ -100,10 +100,10 @@ public class ExploreEffect extends SpellAbilityEffect { final Map runParams = AbilityKey.mapFromCard(c); if (!top.isEmpty()) runParams.put(AbilityKey.Explored, top.getFirst()); game.getTriggerHandler().runTrigger(TriggerType.Explores, runParams, false); + table.replaceCounterEffect(game, sa, true); + triggerList.triggerChangesZoneAll(game, sa); } } - table.replaceCounterEffect(game, sa, true); - triggerList.triggerChangesZoneAll(game, sa); } } diff --git a/forge-game/src/main/java/forge/game/player/PlayerController.java b/forge-game/src/main/java/forge/game/player/PlayerController.java index 8819821d2ff..3137d138c83 100644 --- a/forge-game/src/main/java/forge/game/player/PlayerController.java +++ b/forge-game/src/main/java/forge/game/player/PlayerController.java @@ -132,9 +132,9 @@ public abstract class PlayerController { public abstract List chooseEntitiesForEffect(FCollectionView optionList, int min, int max, DelayedReveal delayedReveal, SpellAbility sa, String title, Player relatedPlayer, Map params); public final boolean confirmAction(SpellAbility sa, PlayerActionConfirmMode mode, String message, Map params) { - return confirmAction(sa, mode, message, params, null); + return confirmAction(sa, mode, message, null, params); } - public abstract boolean confirmAction(SpellAbility sa, PlayerActionConfirmMode mode, String message, Map params, Card cardToShow); + public abstract boolean confirmAction(SpellAbility sa, PlayerActionConfirmMode mode, String message, Card cardToShow, Map params); public abstract boolean confirmBidAction(SpellAbility sa, PlayerActionConfirmMode bidlife, String string, int bid, Player winner); public abstract boolean confirmReplacementEffect(ReplacementEffect replacementEffect, SpellAbility effectSA, GameEntity affected, String question); public abstract boolean confirmStaticApplication(Card hostCard, PlayerActionConfirmMode mode, String message, String logic);