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

Fix reflected only checking activated mana abilities (#9058)

Browse Source
This commit is contained in:
tool4ever
2025-11-02 11:50:16 +01:00
committed by GitHub
parent 6bf288af38
commit 15fca4243d
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -1340,7 +1340,7 @@ public class AbilityUtils {
resolvePreAbilities(sa, game);
// count times ability resolves this turn
if (!sa.isWrapper()) {
if (!sa.isWrapper() && sa.isAbility()) {
final Card host = sa.getHostCard();
if (host != null) {
host.addAbilityResolved(sa);

15
forge-game/src/main/java/forge/game/card/CardUtil.java
View File

@@ -34,6 +34,7 @@ import forge.game.player.Player;
import forge.game.spellability.SpellAbility;
import forge.game.spellability.SpellAbilityPredicates;
import forge.game.spellability.TargetRestrictions;
import forge.game.trigger.Trigger;
import forge.game.zone.ZoneType;
import forge.util.TextUtil;
import forge.util.collect.FCollection;
@@ -304,20 +305,26 @@ public final class CardUtil {
} else if (reflectProperty.equals("Produce")) {
final FCollection<SpellAbility> abilities = new FCollection<>();
for (final Card c : cards) {
abilities.addAll(c.getManaAbilities());
abilities.addAll(c.getSpellAbilities());
for (Trigger trig : c.getTriggers()) {
abilities.add(trig.ensureAbility());
}
}
final List<SpellAbility> reflectAbilities = Lists.newArrayList();
for (final SpellAbility ab : abilities) {
if (ab.isSpell()) {
continue;
}
if (maxChoices == colors.size()) {
break;
}
if (ab.getApi() == ApiType.ManaReflected) {
// Recursion! Set Activator to controller for appropriate valid comparison
ab.setActivatingPlayer(ab.getHostCard().getController());
if (ab.getApi() == ApiType.ManaReflected && !"Produced".equals(ab.getParam("ReflectProperty"))) {
if (!parents.contains(ab.getHostCard())) {
// Recursion! Set Activator to controller for appropriate valid comparison
ab.setActivatingPlayer(ab.getHostCard().getController());
reflectAbilities.add(ab);
parents.add(ab.getHostCard());
}