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

Fix possible NPE in having a player select from a list.

Browse Source
This commit is contained in:
elcnesh
2014-08-18 13:05:08 +00:00
parent fca084c44e
commit f51e767e6b
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -588,9 +588,11 @@ public class PlayerControllerHuman extends PlayerController {
* @see forge.game.player.PlayerController#chooseSomeType(java.lang.String, java.lang.String, java.util.List, java.util.List, java.lang.String)
*/
@Override
public String chooseSomeType(String kindOfType, SpellAbility sa, List<String> validTypes, List<String> invalidTypes, boolean isOptional) {
public String chooseSomeType(final String kindOfType, final SpellAbility sa, final List<String> validTypes, List<String> invalidTypes, final boolean isOptional) {
final List<String> types = Lists.newArrayList(validTypes);
Iterables.removeAll(types, invalidTypes);
if (invalidTypes != null && !invalidTypes.isEmpty()) {
Iterables.removeAll(types, invalidTypes);
}
if(isOptional)
return SGuiChoose.oneOrNone("Choose a " + kindOfType.toLowerCase() + " type", types);
else