From 7e73384566f520ac347479464754f340b49564af Mon Sep 17 00:00:00 2001
From: le-scode <le-scode@users.noreply.github.com>
Date: Sat, 30 Nov 2019 09:31:41 +0100
Subject: [PATCH] Fix #627 - Improve continues cleanup when not trashing a card

---
 vdom/src/com/vdom/core/Player.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vdom/src/com/vdom/core/Player.java b/vdom/src/com/vdom/core/Player.java
index f6180aebf..ecba84621 100644
--- a/vdom/src/com/vdom/core/Player.java
+++ b/vdom/src/com/vdom/core/Player.java
@@ -492,7 +492,7 @@ protected void cleanup(MoveContext context) {
                     if (actualCard.getMultiplyingCards() != null && actualCard.getMultiplyingCards().size() > 0) {
                     	multiplierCards.add(actualCard);
                     	continue;
-                    };
+                    }
                     wouldDiscard.add(card);
                 }
                 for (Card card : wouldDiscard) {
@@ -518,10 +518,10 @@ protected void cleanup(MoveContext context) {
                 	}
                 }
                 Card toImprove = controlPlayer.improve_cardToTrash(context, validImproveCards.toArray(new Card[validImproveCards.size()]));
-                if (toImprove == null) return;
+                if (toImprove == null) break;
                 if (!validImproveCards.contains(toImprove)) {
                 	Util.playerError(this, "Improve error, selected invalid card, ignoring.");
-                	return;
+                	break;
                 }
                 		
                 if (!trashFromPlay(toImprove, Cards.improve, context)) return;