From 2d11b1a99a52041faffb9f57b40a088706483877 Mon Sep 17 00:00:00 2001
From: TRT <>
Date: Wed, 17 Nov 2021 14:07:48 +0100
Subject: [PATCH] Improve filtering

---
 .../src/main/java/forge/ai/ability/RestartGameAi.java     | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ability/RestartGameAi.java b/forge-ai/src/main/java/forge/ai/ability/RestartGameAi.java
index ac35bf1d0c2..78fcd5bacfd 100644
--- a/forge-ai/src/main/java/forge/ai/ability/RestartGameAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/RestartGameAi.java
@@ -1,16 +1,13 @@
 package forge.ai.ability;
 
-import com.google.common.collect.Iterables;
-
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilCard;
 import forge.ai.SpellAbilityAi;
-import forge.game.card.Card;
 import forge.game.card.CardCollection;
 import forge.game.card.CardLists;
-import forge.game.card.CardPredicates.Presets;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
+import forge.game.zone.ZoneType;
 
 public class RestartGameAi extends SpellAbilityAi {
 
@@ -29,8 +26,7 @@ public class RestartGameAi extends SpellAbilityAi {
         }
 
         // check if enough good permanents will be available to be returned, so AI can "autowin"
-        CardCollection exiled = new CardCollection(Iterables.filter(sa.getHostCard().getRemembered(), Card.class));
-        exiled = CardLists.filter(exiled, Presets.PERMANENTS);
+        CardCollection exiled = CardLists.getValidCards(ai.getGame().getCardsIn(ZoneType.Exile), "Permanent.nonAura+IsRemembered", ai, sa.getHostCard(), sa);
         if (ComputerUtilCard.evaluatePermanentList(exiled) > 20) {
             return true;
         }