*Merge.
--HG-- branch : trunk
This commit is contained in:
commit
107218fe44
12 files changed
+185
-99
No files matched your search
+1
-1
@@ -1134,7 +1134,7 @@ void WorldObject::AddToWorld()
|
||||
|
||||
void WorldObject::RemoveFromWorld()
|
||||
{
|
||||
if(m_isActive && !isType(TYPEMASK_PLAYER))
|
||||
if(m_isActive && IsInWorld() && !isType(TYPEMASK_PLAYER))
|
||||
GetMap()->RemoveActiveObject(this);
|
||||
Object::RemoveFromWorld();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user