TriggerHandler: revert zoneCheck with LKI ... it does break more than it fix.

This commit is contained in:
Hanmac
2016-07-23 07:03:15 +00:00
parent b25ad27692
commit a0e4ba6cc7

View File

@@ -398,17 +398,8 @@ public class TriggerHandler {
return false; // Trigger removed by effect return false; // Trigger removed by effect
} }
if (regtrig.getMode().equals(TriggerType.ChangesZone)) { if (!regtrig.zonesCheck(game.getZoneOf(regtrig.getHostCard()))) {
// ChangesZoneTrigger should use ChangeZoneLKI return false; // Host card isn't where it needs to be.
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.
}
} }
for (Trigger t : this.activeTriggers) { for (Trigger t : this.activeTriggers) {