From 245586cefaba1201db506d15481fbb6bc155f16b Mon Sep 17 00:00:00 2001
From: Hans Mackowiak <hanmac@gmx.de>
Date: Fri, 26 Feb 2021 02:40:52 +0100
Subject: [PATCH] GameAction: removeExiledWith when zone is not exile

---
 forge-game/src/main/java/forge/game/Game.java       | 4 ++++
 forge-game/src/main/java/forge/game/GameAction.java | 1 +
 2 files changed, 5 insertions(+)

diff --git a/forge-game/src/main/java/forge/game/Game.java b/forge-game/src/main/java/forge/game/Game.java
index 26c277bff94..e0a73e2897d 100644
--- a/forge-game/src/main/java/forge/game/Game.java
+++ b/forge-game/src/main/java/forge/game/Game.java
@@ -783,6 +783,10 @@ public class Game {
                         cc.removeEncodedCard(c);
                         cc.removeRemembered(c);
                     }
+                    Card exile = c.getExiledWith();
+                    if (exile != null) {
+                        exile.removeExiledWith(c);
+                    }
                     c.ceaseToExist();
                 } else {
                     // return stolen permanents
diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
index f489d0aa7bb..1b1afcdeb20 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -419,6 +419,7 @@ public class GameAction {
                 Card with = c.getExiledWith();
                 if (with != null) {
                     with.removeUntilLeavesBattlefield(c);
+                    with.removeExiledWith(c);
                 }
 
                 c.setExiledWith(null);