From e3f3f0a3ce4f55661fd765e1acf972cdb34c7491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= <Bruebach.Lukas@bdosecurity.de>
Date: Tue, 14 Jan 2025 16:18:04 +0100
Subject: [PATCH] Introduce null checks, add setShortName and collectorNumber
 to deckList export.

---
 cockatrice/src/deck/deck_loader.cpp | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/cockatrice/src/deck/deck_loader.cpp b/cockatrice/src/deck/deck_loader.cpp
index 155f8c038..09f103768 100644
--- a/cockatrice/src/deck/deck_loader.cpp
+++ b/cockatrice/src/deck/deck_loader.cpp
@@ -254,6 +254,14 @@ struct FormatDeckListForExport
             mainBoardCards += QString::number(card->getNumber());
             mainBoardCards += "%20";
             mainBoardCards += card->getName();
+            if (!card->getCardSetShortName().isNull()){
+                mainBoardCards += "%20";
+                mainBoardCards += "(" + card->getCardSetShortName() + ")";
+            }
+            if (!card->getCardCollectorNumber().isNull()) {
+                mainBoardCards += "%20";
+                mainBoardCards += card->getCardCollectorNumber();
+            }
             mainBoardCards += "%0A";
         }
     }
@@ -419,7 +427,19 @@ void DeckLoader::saveToStream_DeckZoneCards(QTextStream &out,
             out << "SB: ";
         }
 
-        out << card->getNumber() << " " << card->getName() << "\n";
+        if (card->getNumber()) {
+            out << card->getNumber();
+        }
+        if (!card->getName().isNull() && !card->getName().isEmpty()) {
+            out << " " << card->getName();
+        }
+        if (!card->getCardSetShortName().isNull() && !card->getCardSetShortName().isEmpty()) {
+            out << " " << "(" << card->getCardSetShortName() << ")";
+        }
+        if (!card->getCardCollectorNumber().isNull()) {
+            out << " " << card->getCardCollectorNumber();
+        }
+        out << "\n";
     }
 }