From a40b5966f5e5a513827f9a4bdc538078815c508c Mon Sep 17 00:00:00 2001 From: Agetian Date: Sun, 29 Jan 2017 04:48:21 +0000 Subject: [PATCH] - Fixed a NPE in TriggerCrewed. --- .../src/main/java/forge/game/trigger/TriggerCrewed.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCrewed.java b/forge-game/src/main/java/forge/game/trigger/TriggerCrewed.java index e55c20f0970..5fb8a6887b0 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerCrewed.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerCrewed.java @@ -21,6 +21,10 @@ public class TriggerCrewed extends Trigger { } } if (this.mapParams.containsKey("ValidCrew")) { + if (runParams2.get("Crew") == null) { + return false; + } + boolean passes = false; for (Object member : (CardCollection)runParams2.get("Crew")) { passes |= matchesValid(member, this.mapParams.get("ValidCrew").split(","),