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

TriggerHandler: try to fix problem with transformed cards in clearInstrinsicActiveTriggers

Browse Source
This commit is contained in:
Hanmac
2016-07-26 19:36:09 +00:00
parent e64923ad88
commit a2bedc6cd6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -220,7 +220,7 @@ public class TriggerHandler {
// Clear if no ZoneFrom, or not coming from the TriggerZone // Clear if no ZoneFrom, or not coming from the TriggerZone
if (c.getId() == t.getHostCard().getId() && t.isIntrinsic()) { if (c.getId() == t.getHostCard().getId() && t.isIntrinsic()) {
if (!t.zonesCheck(zoneFrom)) if (!c.getTriggers().contains(t) || !t.zonesCheck(zoneFrom))
toBeRemoved.add(t); toBeRemoved.add(t);
} }
} }
@@ -497,7 +497,7 @@ public class TriggerHandler {
}; };
} }
else { else {
sa = AbilityFactory.getAbility(host.getSVar(triggerParams.get("Execute")), host); sa = AbilityFactory.getAbility(host, triggerParams.get("Execute"));
} }
} }