missing changes from my prev. commit

This commit is contained in:
SilverIce 2011-10-13 20:44:56 +03:00
parent df0715284f
commit d62061f423

View file

@ -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);