mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 10:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Partially apply f81e455e3a

Browse source
This commit is contained in:
Rochet2 2017-06-18 19:12:52 +03:00 • committed by Antz
parent 0c7bb068e9
commit ace7afa124
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/game/Object/Creature.cpp
View file

@ -196,8 +196,7 @@ Creature::~Creature()
void Creature::AddToWorld() void Creature::AddToWorld()
{ {
#ifdef ENABLE_ELUNA #ifdef ENABLE_ELUNA
if (!IsInWorld()) bool inWorld = IsInWorld();
sEluna->OnAddToWorld(this);
#endif /* ENABLE_ELUNA */ #endif /* ENABLE_ELUNA */
///- Register the creature for guid lookup ///- Register the creature for guid lookup
@ -211,7 +210,7 @@ void Creature::AddToWorld()
SetActiveObjectState(true); SetActiveObjectState(true);
#ifdef ENABLE_ELUNA #ifdef ENABLE_ELUNA
if (!IsInWorld()) if (!inWorld)
sEluna->OnAddToWorld(this); sEluna->OnAddToWorld(this);
#endif /* ENABLE_ELUNA */ #endif /* ENABLE_ELUNA */
} }

5
src/game/Object/GameObject.cpp
View file

@ -93,8 +93,7 @@ GameObject::~GameObject()
void GameObject::AddToWorld() void GameObject::AddToWorld()
{ {
#ifdef ENABLE_ELUNA #ifdef ENABLE_ELUNA
if (!IsInWorld()) bool inWorld = IsInWorld();
sEluna->OnAddToWorld(this);
#endif /* ENABLE_ELUNA */ #endif /* ENABLE_ELUNA */
///- Register the gameobject for guid lookup ///- Register the gameobject for guid lookup
@ -110,7 +109,7 @@ void GameObject::AddToWorld()
UpdateCollisionState(); UpdateCollisionState();
#ifdef ENABLE_ELUNA #ifdef ENABLE_ELUNA
if (!IsInWorld()) if (!inWorld)
sEluna->OnAddToWorld(this); sEluna->OnAddToWorld(this);
#endif /* ENABLE_ELUNA */ #endif /* ENABLE_ELUNA */
} }