From a0e4ba6cc77e545380018019da1dbf337cc8da83 Mon Sep 17 00:00:00 2001 From: Hanmac Date: Sat, 23 Jul 2016 07:03:15 +0000 Subject: [PATCH] TriggerHandler: revert zoneCheck with LKI ... it does break more than it fix. --- .../java/forge/game/trigger/TriggerHandler.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java index 74a4e7644d2..cca32992351 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java @@ -398,17 +398,8 @@ public class TriggerHandler { return false; // Trigger removed by effect } - if (regtrig.getMode().equals(TriggerType.ChangesZone)) { - // ChangesZoneTrigger should use ChangeZoneLKI - final Card lki = game.getChangeZoneLKIInfo(regtrig.getHostCard()); - - if (!regtrig.zonesCheck(game.getZoneOf(lki))) { - return false; // Host card isn't where it needs to be. - } - } else { - if (!regtrig.zonesCheck(game.getZoneOf(regtrig.getHostCard()))) { - return false; // Host card isn't where it needs to be. - } + if (!regtrig.zonesCheck(game.getZoneOf(regtrig.getHostCard()))) { + return false; // Host card isn't where it needs to be. } for (Trigger t : this.activeTriggers) {