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

Guava migration - Inline Iterables.removeAll (Collection overload)

Browse Source
This commit is contained in:
Jetz
2024-09-06 19:58:24 -04:00
parent efe55efa43
commit c1de0dee6a
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-core/src/main/java/forge/util/Iterables.java
View File

@@ -83,10 +83,6 @@ public class Iterables {
return iterable.removeIf(test); return iterable.removeIf(test);
} }
public static boolean removeAll(Collection<?> removeFrom, Collection<?> toRemove) {
return removeFrom.removeAll(toRemove);
}
public static int size(Collection<?> collection) { public static int size(Collection<?> collection) {
return collection.size(); return collection.size();
} }

2
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -1255,7 +1255,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
final List<String> invalidTypes, final boolean isOptional) { final List<String> invalidTypes, final boolean isOptional) {
final List<String> types = Lists.newArrayList(validTypes); final List<String> types = Lists.newArrayList(validTypes);
if (invalidTypes != null && !invalidTypes.isEmpty()) { if (invalidTypes != null && !invalidTypes.isEmpty()) {
Iterables.removeAll(types, invalidTypes); types.removeAll(invalidTypes);
} }
if (kindOfType.equals("Creature")) { if (kindOfType.equals("Creature")) {
sortCreatureTypes(types); sortCreatureTypes(types);