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

- Fixed a NPE in TriggerCrewed.

Browse Source
This commit is contained in:
Agetian
2017-01-29 04:48:21 +00:00
parent a0ba7c2c31
commit a40b5966f5
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/trigger/TriggerCrewed.java
View File

@@ -21,6 +21,10 @@ public class TriggerCrewed extends Trigger {
} }
} }
if (this.mapParams.containsKey("ValidCrew")) { if (this.mapParams.containsKey("ValidCrew")) {
if (runParams2.get("Crew") == null) {
return false;
}
boolean passes = false; boolean passes = false;
for (Object member : (CardCollection)runParams2.get("Crew")) { for (Object member : (CardCollection)runParams2.get("Crew")) {
passes |= matchesValid(member, this.mapParams.get("ValidCrew").split(","), passes |= matchesValid(member, this.mapParams.get("ValidCrew").split(","),