From f122369419e5ba2cf2045503acebc9f48202f848 Mon Sep 17 00:00:00 2001
From: Christian 'ketura' McCarty <hyperlink.teltura@gmail.com>
Date: Wed, 20 Nov 2024 22:04:12 -0600
Subject: [PATCH] Fixed deck notes not showing up in the pre-game screen

---
 .../com/gempukku/lotro/logic/timing/DefaultLotroGame.java     | 4 ++--
 .../com/gempukku/lotro/game/formats/DefaultLotroFormat.java   | 1 +
 .../src/main/java/com/gempukku/lotro/hall/HallServer.java     | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/DefaultLotroGame.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/DefaultLotroGame.java
index 44b85e36d..42d92aa23 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/DefaultLotroGame.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/DefaultLotroGame.java
@@ -84,8 +84,8 @@ public class DefaultLotroGame implements LotroGame {
 
             var note = "Deck used: <a href='" + lotroDeck.getURL(playerId) + "' target='_blank'>" + lotroDeck.getDeckName() +
                     "</a> [" + lotroDeck.getTargetFormat() + "]<br/><br/>Deck Notes:<br/>";
-            if(lotroDeck.getNotes() != null) {
-                note += lotroDeck.getNotes();
+            if(lotroDeck.getNotes() != null && !lotroDeck.getNotes().equals("null")) {
+                note += lotroDeck.getNotes().replace("\n", "<br/>");
             }
             else {
                 note += "No deck notes.";
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java
index f477deb47..253449c7d 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java
@@ -537,6 +537,7 @@ public class DefaultLotroFormat implements LotroFormat {
     @Override
     public LotroDeck applyErrata(LotroDeck deck) {
         LotroDeck deckWithErrata = new LotroDeck(deck.getDeckName());
+        deckWithErrata.setNotes(deck.getNotes());
         deckWithErrata.setTargetFormat(deck.getTargetFormat());
         if (deck.getRingBearer() != null) {
             deckWithErrata.setRingBearer(applyErrata(deck.getRingBearer()));
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 ff990f61a..c7bb5a909 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
@@ -655,6 +655,7 @@ public class HallServer extends AbstractServer {
             CardCollection ownedCollection = _collectionsManager.getPlayerCollection(player, "permanent+trophy");
 
             LotroDeck filteredSpecialCardsDeck = new LotroDeck(lotroDeck.getDeckName());
+            filteredSpecialCardsDeck.setNotes(lotroDeck.getNotes());
             filteredSpecialCardsDeck.setTargetFormat(lotroDeck.getTargetFormat());
             if (lotroDeck.getRing() != null)
                 filteredSpecialCardsDeck.setRing(filterCard(lotroDeck.getRing(), ownedCollection));