diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtil.java b/forge-ai/src/main/java/forge/ai/ComputerUtil.java index bba4fd5265e..6f98328dc1c 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtil.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtil.java @@ -2450,7 +2450,7 @@ public class ComputerUtil { // not enough good choices, need to fill the rest int minDiff = min - goodChoices.size(); if (minDiff > 0) { - goodChoices.addAll(Aggregates.random(CardLists.filter(validCards, Predicates.not(Predicates.in(goodChoices))), minDiff)); + goodChoices.addAll(Aggregates.random(CardLists.filter(validCards, Predicates.not(goodChoices::contains)), minDiff)); return goodChoices; } diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java index 7da2db7aa8d..66316508a8d 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java @@ -924,7 +924,7 @@ public class ComputerUtilCost { public static CardCollection paymentChoicesWithoutTargets(Iterable choices, SpellAbility source, Player ai) { if (source.usesTargeting()) { final CardCollection targets = new CardCollection(source.getTargets().getTargetCards()); - choices = Iterables.filter(choices, Predicates.not(Predicates.and(CardPredicates.isController(ai), Predicates.in(targets)))); + choices = Iterables.filter(choices, Predicates.not(Predicates.and(CardPredicates.isController(ai), targets::contains))); } return new CardCollection(choices); } diff --git a/forge-core/src/main/java/forge/util/Predicates.java b/forge-core/src/main/java/forge/util/Predicates.java index c7c1f4cb1a6..563d646e702 100644 --- a/forge-core/src/main/java/forge/util/Predicates.java +++ b/forge-core/src/main/java/forge/util/Predicates.java @@ -1,6 +1,5 @@ package forge.util; -import java.util.Collection; import java.util.Objects; import java.util.function.Function; import java.util.function.Predicate; @@ -44,7 +43,4 @@ public class Predicates { return x -> Objects.equals(target, x); } - public static Predicate in(Collection target) { - return target::contains; - } } diff --git a/forge-gui/src/main/java/forge/gamemodes/net/server/FServerManager.java b/forge-gui/src/main/java/forge/gamemodes/net/server/FServerManager.java index 683b6a5d2d9..6c559cb04ee 100644 --- a/forge-gui/src/main/java/forge/gamemodes/net/server/FServerManager.java +++ b/forge-gui/src/main/java/forge/gamemodes/net/server/FServerManager.java @@ -147,7 +147,7 @@ public final class FServerManager { broadcastExcept(event, Collections.singleton(notTo)); } public void broadcastExcept(final NetEvent event, final Collection notTo) { - broadcastTo(event, Iterables.filter(clients.values(), Predicates.not(Predicates.in(notTo)))); + broadcastTo(event, Iterables.filter(clients.values(), Predicates.not(notTo::contains))); } private void broadcastTo(final NetEvent event, final Iterable to) { for (final RemoteClient client : to) {