diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/DefaultCardCollection.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/DefaultCardCollection.java index 3820ea466..0ed44b388 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/DefaultCardCollection.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/DefaultCardCollection.java @@ -187,6 +187,14 @@ public class DefaultCardCollection implements MutableCardCollection { return null; } + public void waitTillLoaded() { + try { + _collectionReadyLatch.await(); + } catch (InterruptedException exp) { + throw new RuntimeException(exp); + } + } + @Override public Map getAll() { return Collections.unmodifiableMap(_counts); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java index c13aed269..f483164b0 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java @@ -78,6 +78,7 @@ public class LotroServer extends AbstractServer { } public CardCollection getDefaultCollection() { + _defaultCollection.waitTillLoaded(); return _defaultCollection; } 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 6ec9ab497..626435b9c 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 @@ -210,7 +210,11 @@ public class HallServer extends AbstractServer { } // Now check if player owns all the cards - CardCollection collection = _collectionDao.getCollectionForPlayer(player, collectionType.getCode()); + CardCollection collection; + if (collectionType.getCode().equals("default")) + collection = _lotroServer.getDefaultCollection(); + else + collection = _collectionDao.getCollectionForPlayer(player, collectionType.getCode()); Map deckCardCounts = CollectionUtils.getTotalCardCountForDeck(lotroDeck); final Map collectionCardCounts = collection.getAll(); diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html index 56af8362c..fec80e519 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html @@ -78,6 +78,15 @@ font-size: 90%; } + table.tables { + width: 100%; + } + + table.tables td, table.tables th { + padding: 2px; + border: 1px solid white; + } + .ui-tabs-nav li { font-size: 70%; } diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/hallUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/hallUi.js index c7039aae0..a1c7e6d37 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/hallUi.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/hallUi.js @@ -147,7 +147,7 @@ var GempLotrHallUI = Class.extend({ var tables = root.getElementsByTagName("table"); var tablesTable = $("
"); - tablesTable.append("FormatTournamentStatusPlayersActions"); + tablesTable.append("FormatTournamentStatusPlayersActions"); for (var i = 0; i < tables.length; i++) { var table = tables[i]; @@ -257,6 +257,6 @@ var GempLotrHallUI = Class.extend({ row.append(actionsField); - this.container.append(row); + container.append(row); } }); \ No newline at end of file