From 18924c7bf08b9e074531292e5ddc4deb839f5fad Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Wed, 18 Jan 2012 20:16:07 +0000
Subject: [PATCH] - The casual games now have correct amount of cards in deck.

---
 .../src/main/java/com/gempukku/lotro/hall/HallServer.java    | 5 +++--
 .../gemp-lotr-web/src/main/webapp/includes/changeLog.html    | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

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 @@
 <pre style="font-size:80%">
+<b>18 Jan. 2012</b>
+- The casual games now have correct amount of cards in deck.
+
 <b>17 Jan. 2012</b>
 - "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.