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

Merge pull request #167 from kevlahnota/master

Browse Source 
fix stackoverflow
This commit is contained in:
Anthony Calosa
2022-04-29 05:38:19 +08:00
committed by GitHub
parent d118be7ee4 2cd6d7a047
commit 35940cd409
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3029,6 +3029,10 @@ public class AbilityUtils {
} }
private static void addPlayer(Iterable<Object> objects, final String def, FCollection<Player> players) { private static void addPlayer(Iterable<Object> objects, final String def, FCollection<Player> players) {
addPlayer(objects, def, players, false);
}
private static void addPlayer(Iterable<Object> objects, final String def, FCollection<Player> players, boolean skipRemembered) {
for (Object o : objects) { for (Object o : objects) {
if (o instanceof Player) { if (o instanceof Player) {
final Player p = (Player) o; final Player p = (Player) o;
@@ -3043,8 +3047,9 @@ public class AbilityUtils {
players.add(c.getController()); players.add(c.getController());
} else if (def.endsWith("Owner")) { } else if (def.endsWith("Owner")) {
players.add(c.getOwner()); players.add(c.getOwner());
} else if (def.endsWith("Remembered")) { } else if (def.endsWith("Remembered") && !skipRemembered) {
addPlayer(c.getRemembered(), def, players); //fixme recursive call to skip so it will not cause StackOverflow, ie Riveteers Overlook
addPlayer(c.getRemembered(), def, players, true);
} }
} else if (o instanceof SpellAbility) { } else if (o instanceof SpellAbility) {
final SpellAbility c = (SpellAbility) o; final SpellAbility c = (SpellAbility) o;