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 shadowCharacters) { - _skirmish = new Skirmish(fellowshipCharacter, shadowCharacters); + _skirmish = new Skirmish(fellowshipCharacter, new HashSet(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 _shadowCharacters; + private final Set _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. 27 Apr. 2012 - "Morning Came" now correctly adds +2 Strength to the character if shadow player puts card from hand beneath his/her