Fix bad references for snapshots

Card-Forge · Aug 13, 2024 · 6886992 · 6886992
1 parent 67b18b2
commit 6886992
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/forge-game/src/main/java/forge/game/GameSnapshot.java b/forge-game/src/main/java/forge/game/GameSnapshot.java
@@ -362,16 +362,16 @@ public void copyGameState(Game fromGame, Game toGame) {
             if (fromCard.getCloneOrigin() != null) {
                 newCard.setCloneOrigin(toGame.findById(fromCard.getCloneOrigin().getId()));
             }
-            if (newCard.getHaunting() != null) {
+            if (fromCard.getHaunting() != null) {
                 newCard.setHaunting(toGame.findById(fromCard.getHaunting().getId()));
             }
-            if (newCard.getEffectSource() != null) {
+            if (fromCard.getEffectSource() != null) {
                 newCard.setEffectSource(toGame.findById(fromCard.getEffectSource().getId()));
             }
-            if (newCard.isPaired()) {
+            if (fromCard.isPaired()) {
                 newCard.setPairedWith(toGame.findById(fromCard.getPairedWith().getId()));
             }
-            if (newCard.getCopiedPermanent() != null) {
+            if (fromCard.getCopiedPermanent() != null) {
                 newCard.setCopiedPermanent(toGame.findById(fromCard.getCopiedPermanent().getId()));
             }
             // TODO: Verify that the above relationships are preserved bi-directionally or not.

diff --git a/forge-game/src/main/java/forge/game/card/CardCopyService.java b/forge-game/src/main/java/forge/game/card/CardCopyService.java
@@ -47,6 +47,7 @@ public final Card copyCard(boolean assignNewId, Player owner) {
 
             // need to copy this values for the tokens
             out.setTokenSpawningAbility(copyFrom.getTokenSpawningAbility());
+            out.setCopiedPermanent(copyFrom.getCopiedPermanent());
         } else {
             out = assignNewId ? getCard(copyFrom.getPaperCard(), owner, toGame)
                     : getCard(copyFrom.getPaperCard(), owner, copyFrom.getId(), toGame);