From 2952a0e2aa7d9fa58bc37c5f235a61f28afd6a29 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 6 Dec 2014 19:53:24 +0100
Subject: [PATCH] Make Resurrect function reset most of the runtime state
 (Fixes #2181)

---
 apps/openmw/mwscript/statsextensions.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index d5647db10..63405e5b8 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -1179,7 +1179,14 @@ namespace MWScript
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
                     MWWorld::Ptr ptr = R()(runtime);
-                    ptr.getClass().getCreatureStats(ptr).resurrect();
+
+                    if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
+                        ptr.getClass().getCreatureStats(ptr).resurrect();
+                    else if (ptr.getClass().getCreatureStats(ptr).isDead())
+                    {
+                        // resets runtime state such as inventory, stats and AI. does not reset position in the world
+                        ptr.getRefData().setCustomData(NULL);
+                    }
                 }
         };