diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java index bfe300306..eb3036d32 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java @@ -247,10 +247,11 @@ public class HallServer extends AbstractServer { int owned = 0; if (ownedCollection != null) owned = ownedCollection.getItemCount(blueprintId); + int fromOwned = Math.min(owned, count); - for (int i = 0; i < owned; i++) + for (int i = 0; i < fromOwned; i++) filteredSpecialCardsDeck.addCard(blueprintId); - for (int i = 0; i < (count - owned); i++) + for (int i = 0; i < (count - fromOwned); i++) filteredSpecialCardsDeck.addCard(_library.getBaseBlueprintId(blueprintId)); } 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 8dca72177..155796cc2 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 @@ -1,4 +1,7 @@
+18 Jan. 2012
+- The casual games now have correct amount of cards in deck.
+
 17 Jan. 2012
 - "Deagol" should be able to play an artifact or possession without freezing the game.
 - "Sam, Bearer of Great Need" may now start as a Ring-Bearer.