From c675f3b4d10b3f7af13888d577cead6678fc3a94 Mon Sep 17 00:00:00 2001
From: Zzooouhh <Zzooouhh@users.noreply.github.com>
Date: Sat, 30 Dec 2017 02:26:14 +0100
Subject: [PATCH] Cleanup, improvements etc.

---
 .../main/java/mage/players/PlayerImpl.java    | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java
index 79a51614271..ebe58d9b414 100644
--- a/Mage/src/main/java/mage/players/PlayerImpl.java
+++ b/Mage/src/main/java/mage/players/PlayerImpl.java
@@ -2319,24 +2319,21 @@ public abstract class PlayerImpl implements Player, Serializable {
             if (count < target.getNumberOfTargets()) {
                 newTarget.setMinNumberOfTargets(count);
             }
-            boolean finishedSearch = false;
-            while (true) {
+            do {
                 if (newTarget.choose(Outcome.Neutral, playerId, targetPlayerId, game)) {
-                    finishedSearch = true;
-                }
-                if (!targetPlayerId.equals(playerId) || handleLibraryCastableCards(library, game, targetPlayerId)) { // for handling Panglacial Wurm
-                    if (finishedSearch) {
+                    if (!targetPlayerId.equals(playerId) || !handleLibraryCastableCreatures(library, game, targetPlayerId)) { // for handling Panglacial Wurm
                         target.getTargets().clear();
                         for (UUID targetId : newTarget.getTargets()) {
                             target.add(targetId, game);
                         }
                         game.fireEvent(GameEvent.getEvent(GameEvent.EventType.LIBRARY_SEARCHED, targetPlayerId, playerId));
                     }
-                    break;
+                } else if (targetPlayerId.equals(playerId) && handleLibraryCastableCreatures(library, game, targetPlayerId)) {
+                    newTarget.clearChosen();
+                    continue;
                 }
-                newTarget.clearChosen();
-                finishedSearch = false;
-            }
+                break;
+            } while (true);
             return true;
         }
         return false;
@@ -2382,11 +2379,11 @@ public abstract class PlayerImpl implements Player, Serializable {
                         }
                         break;
                     }
-                    return false;
+                    return true;
                 }
             }
         }
-        return true;
+        return false;
     }
 
     @Override