From 1dc64e18c60a2889db5bb7aba5261a4a47325c71 Mon Sep 17 00:00:00 2001 From: drdev Date: Wed, 1 Oct 2014 19:11:28 +0000 Subject: [PATCH] Ensure tapped reset when card leaves the battlefield --- forge-game/src/main/java/forge/game/GameAction.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java index e0ac822d7a3..33b3e20d6a5 100644 --- a/forge-game/src/main/java/forge/game/GameAction.java +++ b/forge-game/src/main/java/forge/game/GameAction.java @@ -229,6 +229,10 @@ public class GameAction { if (fromBattlefield) { c.setZone(zoneTo); c.setDamage(0); //clear damage after a card leaves the battlefield + if (c.isTapped()) { + c.setTapped(false); //untap card after it leaves the battlefield if needed + game.fireEvent(new GameEventCardTapped(c, false)); + } } // Need to apply any static effects to produce correct triggers