1 files changed, 14 insertions, 0 deletions
diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index b690dbccddb..9afe4aa35f7 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -921,6 +921,20 @@ 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)
+    {
+        if (Unit* owner = GetOwner())
+            owner->RemoveGameObject(this, false);
+        else
+            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)