From 055dab6d60bd2a3e7e5b96142f4a7177db82e01f Mon Sep 17 00:00:00 2001 From: Hanmac Date: Tue, 26 Sep 2017 05:22:00 +0000 Subject: [PATCH] ExploreEffect: fixed trigger and counter part git-svn-id: http://svn.slightlymagic.net/forge/trunk@35773 269b9781-a132-4a9b-9d4e-f004f1b56b58 --- .../forge/game/ability/effects/ExploreEffect.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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 95ac5f3a..cecb6419 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 @@ -62,15 +62,17 @@ public class ExploreEffect extends SpellAbilityEffect { } } if (!revealedLand) { - // TODO need to check if card didn't blick while that was happening, - // probably need strictlySelf in the Defined - if (game.getZoneOf(c).is(ZoneType.Battlefield)) { + // currently the timestamp check only works for if the card itself explore, + // if something else can make it explore that need to be updated + if (game.getZoneOf(c).is(ZoneType.Battlefield) && card.getTimestamp() == c.getTimestamp()) { c.addCounter(CounterType.P1P1, 1, card, true); - final Map runParams = Maps.newHashMap(); - runParams.put("Card", c); - game.getTriggerHandler().runTrigger(TriggerType.Explores, runParams, false); } } + + // a creature does explore even if it isn't on the battlefield anymore + final Map runParams = Maps.newHashMap(); + runParams.put("Card", c); + game.getTriggerHandler().runTrigger(TriggerType.Explores, runParams, false); } }