From 65567e65b11120fd813d0712df7e31736bdfb76a Mon Sep 17 00:00:00 2001
From: Christian 'ketura' McCarty <hyperlink.teltura@gmail.com>
Date: Sat, 13 May 2023 02:27:03 -0500
Subject: [PATCH] Fixed the empty adventure deck bug.  Fixed cards in
 discard/dead pile/adventure deck being super tiny the first time the dialog
 is loaded.

---
 .../src/main/web/js/gemp-022/gameUi.js           | 13 +++++++------
 .../com/gempukku/lotro/game/state/GameState.java | 16 ++++++++++++++--
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/gameUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/gameUi.js
index e99be53ba..7226d37c9 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/gameUi.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/gameUi.js
@@ -328,27 +328,28 @@ var GempLotrGameUI = Class.extend({
             $("#showStats" + i).append(showBut);
         }
 
+        //TODO: This is where we will need to add support for public discard piles
         if (!this.spectatorMode) {
             $("#discard" + this.getPlayerIndex(this.bottomPlayerId)).addClass("clickable").click(
                 (function (index) {
                     return function () {
-                        var dialog = that.discardPileDialogs[that.bottomPlayerId];
-                        var group = that.discardPileGroups[that.allPlayerIds[index]];
+                        var dialog = that.discardPileDialogs[index];
+                        var group = that.discardPileGroups[index];
                         openSizeDialog(dialog);
                         that.dialogResize(dialog, group);
                         group.layoutCards();
                     };
-                })(i));
+                })(that.bottomPlayerId));
             $("#adventureDeck" + this.getPlayerIndex(this.bottomPlayerId)).addClass("clickable").click(
                 (function (index) {
                     return function () {
-                        var dialog = that.adventureDeckDialogs[that.bottomPlayerId];
-                        var group = that.adventureDeckGroups[that.allPlayerIds[index]];
+                        var dialog = that.adventureDeckDialogs[index];
+                        var group = that.adventureDeckGroups[index];
                         openSizeDialog(dialog);
                         that.dialogResize(dialog, group);
                         group.layoutCards();
                     };
-                })(i));
+                })(that.bottomPlayerId));
         }
 
         for (var i = 0; i < this.allPlayerIds.length; i++) {
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 791defaca..78c3a2762 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
@@ -96,11 +96,23 @@ public class GameState {
             }
         }
 
-        for (String playerId : playerOrder.getAllPlayers())
+        for (String playerId : playerOrder.getAllPlayers()) {
             _playerThreats.put(playerId, 0);
+        }
 
-        for (GameStateListener listener : getAllGameStateListeners())
+        for (GameStateListener listener : getAllGameStateListeners()) {
             listener.setPlayerOrder(playerOrder.getAllPlayers());
+        }
+
+        //This needs done after the Player Order initialization has been issued, or else the player
+        // adventure deck areas don't exist.
+        for (String playerId : playerOrder.getAllPlayers()) {
+            for(var site : getAdventureDeck(playerId)) {
+                for (GameStateListener listener : getAllGameStateListeners()) {
+                    listener.cardCreated(site);
+                }
+            }
+        }
     }
 
     public boolean isMoving() {