ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed deck notes not showing up in the pre-game screen

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2024-11-20 22:04:12 -06:00
parent 6caac39c82
commit f122369419
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/DefaultLotroGame.java
View File

@@ -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.";

1
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java
View File

@@ -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()));

1
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
View File

@@ -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));