external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

TriggerHandler: corner the special case where the ChangesZone Trigger should be active

Browse Source 
only if its a dies (Battlefield -> Graveyard) trigger.
This commit is contained in:
Hanmac
2016-08-09 15:23:52 +00:00
parent 1098dd39a1
commit 4cb35e7754
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
View File

@@ -404,10 +404,14 @@ public class TriggerHandler {
} }
if (!regtrig.zonesCheck(game.getZoneOf(regtrig.getHostCard()))) { if (!regtrig.zonesCheck(game.getZoneOf(regtrig.getHostCard()))) {
final Map<String, String> params = regtrig.getMapParams();
final Card hostCard = regtrig.getHostCard();
if (!(regtrig instanceof TriggerChangesZone && if (!(regtrig instanceof TriggerChangesZone &&
regtrig.getHostCard().getZone().is(ZoneType.Graveyard) && "Battlefield".equals(params.get("Origin")) &&
"Graveyard".equals(params.get("Destination")) &&
hostCard.getZone().is(ZoneType.Graveyard) &&
regtrig.getActiveZone().contains(ZoneType.Battlefield) && regtrig.getActiveZone().contains(ZoneType.Battlefield) &&
game.getLastStateBattlefield().contains(regtrig.getHostCard()))) { game.getLastStateBattlefield().contains(hostCard))) {
return false; // Host card isn't where it needs to be. return false; // Host card isn't where it needs to be.
} }
} }