aboutsummaryrefslogtreecommitdiff
path: root/src/game/Object.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/Object.cpp')
-rw-r--r--src/game/Object.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 4e000184763..a9534723354 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -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();
}