From bc842b41d59c314b32309d5562c7b51535d33be9 Mon Sep 17 00:00:00 2001 From: drdev Date: Tue, 2 Feb 2016 03:26:14 +0000 Subject: [PATCH] Prevent crash due to null predicate --- .../src/main/java/forge/planarconquest/ConquestRegion.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestRegion.java b/forge-gui/src/main/java/forge/planarconquest/ConquestRegion.java index 58e85355d8d..e37cfcb93ae 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestRegion.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestRegion.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Set; import com.google.common.base.Predicate; +import com.google.common.base.Predicates; import forge.GuiBase; import forge.assets.ISkinImage; @@ -87,7 +88,7 @@ public class ConquestRegion { String name = null; String artCardName = null; ColorSet colorSet = ColorSet.ALL_COLORS; - Predicate pred = null; + Predicate pred = Predicates.alwaysTrue(); String[] pieces = line.trim().split("\\|"); for (String piece : pieces) {