From ff17ebbc6cd5447f1efeb8ea2e4378eaae2cdf24 Mon Sep 17 00:00:00 2001 From: Myrd Date: Tue, 16 Dec 2014 19:07:58 +0000 Subject: [PATCH] Clear cards in battlefield before adding the loaded ones when using set up game state function. --- forge-gui/src/main/java/forge/player/GameState.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/forge-gui/src/main/java/forge/player/GameState.java b/forge-gui/src/main/java/forge/player/GameState.java index d6a4d56fe7b..d7925d559ef 100644 --- a/forge-gui/src/main/java/forge/player/GameState.java +++ b/forge-gui/src/main/java/forge/player/GameState.java @@ -3,6 +3,7 @@ package forge.player; import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; +import java.util.ArrayList; import java.util.EnumMap; import java.util.HashMap; import java.util.Map; @@ -186,6 +187,7 @@ public class GameState { if (life > 0) p.setLife(life, null); for (Entry kv : humanCards.entrySet()) { if (kv.getKey() == ZoneType.Battlefield) { + p.getZone(kv.getKey()).setCards(new ArrayList()); for (final Card c : kv.getValue()) { p.getZone(ZoneType.Hand).add(c); p.getGame().getAction().moveToPlay(c);