diff options
| -rw-r--r-- | src/game/GameObject.cpp | 13 | ||||
| -rw-r--r-- | src/game/GameObject.h | 5 |
2 files changed, 5 insertions, 13 deletions
diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index 526b60c1de9..c3bfc1d77b9 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -921,19 +921,6 @@ void GameObject::SetGoArtKit(uint8 kit) data->ArtKit = kit; } -/* -void GameObject::SetOwnerGUID(uint64 owner) -{ - // Owner already found and different than expected owner - remove object from old owner - if (owner && GetOwnerGUID() && GetOwnerGUID() != owner) - { - assert(false); - } - m_spawnedByDefault = false; // all object with owner is despawned after delay - SetUInt64Value(OBJECT_FIELD_CREATED_BY, owner); -} -*/ - void GameObject::SwitchDoorOrButton(bool activate, bool alternative /* = false */) { if(activate) diff --git a/src/game/GameObject.h b/src/game/GameObject.h index 8e2a37fe55e..43441e2fb9c 100644 --- a/src/game/GameObject.h +++ b/src/game/GameObject.h @@ -611,6 +611,11 @@ class TRINITY_DLL_SPEC GameObject : public WorldObject void SetOwnerGUID(uint64 owner) { + // Owner already found and different than expected owner - remove object from old owner + if (owner && GetOwnerGUID() && GetOwnerGUID() != owner) + { + assert(false); + } m_spawnedByDefault = false; // all object with owner is despawned after delay SetUInt64Value(OBJECT_FIELD_CREATED_BY, owner); } |