From c693c52bbd91140314bd36aa1a3cc3b761b30994 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Thu, 15 Mar 2012 21:31:41 +0000 Subject: [PATCH] Fixing assignments. --- .../turn/assign/FreePeoplePlayerAssignsMinionsGameProcess.java | 3 ++- .../src/main/java/com/gempukku/lotro/server/DaoProvider.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/FreePeoplePlayerAssignsMinionsGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/FreePeoplePlayerAssignsMinionsGameProcess.java index cdf0c4260..829238e98 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/FreePeoplePlayerAssignsMinionsGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/FreePeoplePlayerAssignsMinionsGameProcess.java @@ -75,8 +75,9 @@ public class FreePeoplePlayerAssignsMinionsGameProcess implements GameProcess { new AssignmentPhaseEffect(gameState.getCurrentPlayerId(), assignments, "Free People player assignments")); } }); + } else { + _leftoverMinions = new HashSet(); } - } }); game.getActionsEnvironment().addActionToStack(action); diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/DaoProvider.java b/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/DaoProvider.java index c937e337d..bbe683dfa 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/DaoProvider.java +++ b/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/DaoProvider.java @@ -27,12 +27,13 @@ public class DaoProvider implements InjectableProvider { private DbAccess _dbAccess; private CollectionSerializer _collectionSerializer; - @Context private LotroCardBlueprintLibrary _library; public DaoProvider() { _dbAccess = new DbAccess(); _collectionSerializer = new CollectionSerializer(); + + _library = new LotroCardBlueprintLibrary(); } @Override