From a0695c08cc256cfb300c1425b4faba25a0cb5af6 Mon Sep 17 00:00:00 2001 From: Hellfish Date: Wed, 20 Nov 2013 20:05:02 +0000 Subject: [PATCH] *Remove Inbound Tokens at appropriate places if the etb of the same token was replaced. Fixes Chronozoa. --- forge-gui/src/main/java/forge/game/GameAction.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/forge-gui/src/main/java/forge/game/GameAction.java b/forge-gui/src/main/java/forge/game/GameAction.java index bcc98729fd7..46c46c7119f 100644 --- a/forge-gui/src/main/java/forge/game/GameAction.java +++ b/forge-gui/src/main/java/forge/game/GameAction.java @@ -200,8 +200,10 @@ public class GameAction { ReplacementResult repres = game.getReplacementHandler().run(repParams); if (repres != ReplacementResult.NotReplaced) { if (game.getStack().isResolving(c) && !zoneTo.is(ZoneType.Graveyard) && repres == ReplacementResult.Prevented) { - return this.moveToGraveyard(c); + copied.getOwner().removeInboundToken(copied); + return this.moveToGraveyard(c); } + copied.getOwner().removeInboundToken(copied); return c; }