From 204de8abbb0cf741f6817dfcf505cbfc3b6848f1 Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Mon, 30 Apr 2012 19:51:57 +0000
Subject: [PATCH] - Game no longer freezes sometimes, when a minion is removed
 from skirmish, before it resolves.

---
 .../src/main/java/com/gempukku/lotro/game/state/GameState.java  | 2 +-
 .../src/main/java/com/gempukku/lotro/game/state/Skirmish.java   | 2 +-
 gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
index f4450bb9f..6a57a451a 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
@@ -1001,7 +1001,7 @@ public class GameState {
     }
 
     public void startSkirmish(PhysicalCard fellowshipCharacter, Set<PhysicalCard> shadowCharacters) {
-        _skirmish = new Skirmish(fellowshipCharacter, shadowCharacters);
+        _skirmish = new Skirmish(fellowshipCharacter, new HashSet<PhysicalCard>(shadowCharacters));
         for (GameStateListener listener : getAllGameStateListeners())
             listener.startSkirmish(_skirmish.getFellowshipCharacter(), _skirmish.getShadowCharacters());
     }
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/Skirmish.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/Skirmish.java
index 822e036f7..38ad5ceb4 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/Skirmish.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/Skirmish.java
@@ -8,7 +8,7 @@ import java.util.Set;
 
 public class Skirmish {
     private PhysicalCard _fellowshipCharacter;
-    private Set<PhysicalCard> _shadowCharacters;
+    private final Set<PhysicalCard> _shadowCharacters;
     private boolean _cancelled;
 
     private Evaluator _fpStrengthOverrideEvaluator;
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
index bdab3b0af..9b75f7f4c 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
@@ -4,6 +4,7 @@
 - "Realm of Dwarrowdelf" now has two separate limits (for str and dmg).
 - "Caras Galadhon" should no longer work badly in case of some assignment actions (Orc Assassin).
 - "Argument Ready to Hand" now asks the Shadow player to choose a race, rather than FP player.
+- Game no longer freezes sometimes, when a minion is removed from skirmish, before it resolves. 
 
 <b>27 Apr. 2012</b>
 - "Morning Came" now correctly adds +2 Strength to the character if shadow player puts card from hand beneath his/her