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

Merge branch 'master' of https://git.cardforge.org/core-developers/forge

Browse Source
This commit is contained in:
CCTV-1
2019-12-21 12:38:06 +08:00
parent 1117ff1e7c d68c740e1d
commit a050b584ac
25 changed files with 116 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java
View File

@@ -481,7 +481,7 @@ public class PlayerControllerForTests extends PlayerController {
}
@Override
public String chooseSomeType(String kindOfType, SpellAbility sa, List<String> validTypes, List<String> invalidTypes, boolean isOptional) {
public String chooseSomeType(String kindOfType, SpellAbility sa, Collection<String> validTypes, List<String> invalidTypes, boolean isOptional) {
return chooseItem(validTypes);
}