From 25362f728f62db3142597bd1e3519eb7cadb01a0 Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Sun, 4 Oct 2015 07:57:59 +0000
Subject: [PATCH] - Ensure that a card is returned to its original state when
 it's being moved from the battlefield (fixes e.g. a Manifested tapland
 returning to hand that then causes a crash when that same land is played from
 hand later). - This is a little experimental, please test for possible
 issues!

---
 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 d24c50194a4..7fde910cde0 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -177,6 +177,10 @@ public class GameAction {
 
                 copied.setUnearthed(c.isUnearthed());
                 copied.setTapped(false);
+                if (fromBattlefield) {
+                    // when a card leaves the battlefield, ensure it's in its original state
+                    copied.setState(CardStateName.Original, false);
+                }
                 for (final Trigger trigger : copied.getTriggers()) {
                     trigger.setHostCard(copied);
                 }