From 9c44662f2eaf70b241ebce62f3cda4ea5a31b3bd Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Sun, 20 Aug 2017 03:24:25 +0000
Subject: [PATCH] - Fixed a NPE in the new AiController code.

---
 forge-ai/src/main/java/forge/ai/AiController.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/AiController.java b/forge-ai/src/main/java/forge/ai/AiController.java
index 3cfc204d48b..959e3f871aa 100644
--- a/forge-ai/src/main/java/forge/ai/AiController.java
+++ b/forge-ai/src/main/java/forge/ai/AiController.java
@@ -840,13 +840,11 @@ public class AiController {
             sourceCard = sa.getHostCard();
             if ("Always".equals(sa.getParam("AILogic")) && !validCards.isEmpty()) {
                 min = 1;
+            } else if ("VolrathsShapeshifter".equals(sa.getParam("AILogic"))) {
+                return SpecialCardAi.VolrathsShapeshifter.targetBestCreature(player, sa);
             }
         }
 
-        if ("VolrathsShapeshifter".equals(sa.getParam("AILogic"))) {
-            return SpecialCardAi.VolrathsShapeshifter.targetBestCreature(player, sa);
-        }
-
         // look for good discards
         while (count < min) {
             Card prefCard = null;