From d0e0b11186dac3ae2b3471b6f45393a6a27a3345 Mon Sep 17 00:00:00 2001
From: Hans Mackowiak <hanmac@gmx.de>
Date: Wed, 17 Mar 2021 19:20:56 +0100
Subject: [PATCH] better alias for XStream IO

---
 .../src/main/java/forge/gamemodes/gauntlet/GauntletIO.java    | 2 +-
 .../src/main/java/forge/gamemodes/quest/io/QuestDataIO.java   | 4 ++--
 .../main/java/forge/gamemodes/tournament/TournamentIO.java    | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletIO.java b/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletIO.java
index 0b6dec49290..b1233c1bebe 100644
--- a/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletIO.java
+++ b/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletIO.java
@@ -75,7 +75,7 @@ public class GauntletIO {
         xStream.autodetectAnnotations(true);
 
         // Alias for renamed
-        xStream.alias("forge.gauntlet.GauntletData", GauntletData.class);
+        xStream.aliasPackage("forge.gauntlet", GauntletIO.class.getPackage().getName());
         return xStream;
     }
 
diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/io/QuestDataIO.java b/forge-gui/src/main/java/forge/gamemodes/quest/io/QuestDataIO.java
index 2adc13a160b..bdf872ae96a 100644
--- a/forge-gui/src/main/java/forge/gamemodes/quest/io/QuestDataIO.java
+++ b/forge-gui/src/main/java/forge/gamemodes/quest/io/QuestDataIO.java
@@ -139,9 +139,9 @@ public class QuestDataIO {
         xStream.alias("DeckSection", CardPool.class);
 
         // alias for renamed quest data
-        xStream.alias("forge.quest.data.QuestData", QuestData.class);
+        xStream.aliasPackage("forge.quest", "forge.gamemodes.quest");
         xStream.alias("forge.quest.data.item.QuestItemType", QuestItemType.class);
-        xStream.alias("forge.quest.data.QuestItemCondition", QuestItemCondition.class);
+
         return xStream;
     }
 
diff --git a/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentIO.java b/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentIO.java
index 91f79b34aad..7e2af61a758 100644
--- a/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentIO.java
+++ b/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentIO.java
@@ -55,6 +55,7 @@ public class TournamentIO {
         });
         xStream.registerConverter(new DeckSectionToXml());
         xStream.autodetectAnnotations(true);
+        xStream.aliasPackage("forge.tournament", TournamentIO.class.getPackage().getName());
         return xStream;
     }