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

Merge branch 'fixRemembered' into 'master'

Browse Source 
Fix RememberDiscarded

See merge request core-developers/forge!4304
This commit is contained in:
Bug Hunter
2021-03-29 17:03:48 +00:00
parent eed7b282d3 baf5479d0b
commit 6971d320ae
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
View File

@@ -671,6 +671,10 @@ public abstract class SpellAbilityEffect {
if (card == null) { continue; } if (card == null) { continue; }
if (p.discard(card, sa, table) != null) { if (p.discard(card, sa, table) != null) {
discardedByPlayer.add(card); discardedByPlayer.add(card);
if (sa.hasParam("RememberDiscarded")) {
sa.getHostCard().addRemembered(card);
}
} }
} }
discardedMap.put(p, discardedByPlayer); discardedMap.put(p, discardedByPlayer);

4
forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java
View File

@@ -291,10 +291,6 @@ public class DiscardEffect extends SpellAbilityEffect {
discard(sa, table, discardedMap); discard(sa, table, discardedMap);
if (sa.hasParam("RememberDiscarded")) {
source.addRemembered(discardedMap.values());
}
// run trigger if something got milled // run trigger if something got milled
table.triggerChangesZoneAll(game); table.triggerChangesZoneAll(game);
} // discardResolve() } // discardResolve()