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

WrappedAbility: fix TriggeredRemembered being sacrificed

Browse Source
This commit is contained in:
Hans Mackowiak
2021-01-09 06:15:05 +00:00
committed by Michael Kamensky
parent 35ca083650
commit 584b6bd81e
6 changed files with 97 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-game/src/main/java/forge/game/trigger/WrappedAbility.java
View File

@@ -17,7 +17,6 @@ import java.util.Map.Entry;
import java.util.Set;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
// Wrapper ability that checks the requirements again just before
@@ -487,18 +486,6 @@ public class WrappedAbility extends Ability {
return;
}
// Check timestamps of triggered objects
final List<Object> original = Lists.newArrayList(sa.getTriggerRemembered());
for (Object o : original) {
if (o instanceof Card) {
Card card = (Card) o;
Card current = game.getCardState(card);
if (current.getTimestamp() != card.getTimestamp()) {
// TODO: figure out if NoTimestampCheck should be the default for ChangesZone triggers
sa.getTriggerRemembered().remove(o);
}
}
}
final Map<AbilityKey, Object> triggerMap = AbilityKey.newMap(sa.getTriggeringObjects());
for (Entry<AbilityKey, Object> ev : triggerMap.entrySet()) {
if (ev.getValue() instanceof Card) {