From d62061f4234b4ed468656c25cd290eda7a811de0 Mon Sep 17 00:00:00 2001
From: SilverIce <slifeleaf@gmail.com>
Date: Thu, 13 Oct 2011 20:44:56 +0300
Subject: [PATCH] missing changes from my prev. commit

---
 src/game/Object.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 66e8a2b0f..0fe246d0c 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -1885,7 +1885,9 @@ void WorldObject::SetActiveObjectState(bool active)
     if (m_isActiveObject == active || (isType(TYPEMASK_PLAYER) && !active))  // player shouldn't became inactive, never
         return;
 
-    if (IsInWorld())
+    if (IsInWorld() && !isType(TYPEMASK_PLAYER))
+        // player's update implemented in a different from other active worldobject's way
+        // it's considired to use generic way in future
     {
         if (isActiveObject() && !active)
             GetMap()->RemoveFromActive(this);