aboutsummaryrefslogtreecommitdiff
path: root/src/game/Object.h
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-25 15:54:23 -0600
committermegamage <none@none>2009-03-25 15:54:23 -0600
commit581ae2719d1639d063a812901ff4b0983169cde7 (patch)
tree77db4a465848205ee497a140a1b1c4efa0c47db4 /src/game/Object.h
parent435570903a8eee6e9d81dd3e871aace1eb3cd73e (diff)
*Do not allow to add/remove obj to/from world more than once.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Object.h')
-rw-r--r--src/game/Object.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game/Object.h b/src/game/Object.h
index 1a7a70163ca..7e18ea4db92 100644
--- a/src/game/Object.h
+++ b/src/game/Object.h
@@ -130,6 +130,9 @@ class TRINITY_DLL_SPEC Object
}
virtual void RemoveFromWorld()
{
+ if(!m_inWorld)
+ return;
+
// if we remove from world then sending changes not required
if(m_uint32Values)
ClearUpdateMask(true);