diff options
Diffstat (limited to 'src/server/game/Entities')
7 files changed, 8 insertions, 2 deletions
diff --git a/src/server/game/Entities/AreaTrigger/AreaTrigger.h b/src/server/game/Entities/AreaTrigger/AreaTrigger.h index b6bc632c417..0d03f845cdf 100644 --- a/src/server/game/Entities/AreaTrigger/AreaTrigger.h +++ b/src/server/game/Entities/AreaTrigger/AreaTrigger.h @@ -137,6 +137,7 @@ class TC_GAME_API AreaTrigger : public WorldObject, public GridObject<AreaTrigge AreaTriggerTemplate const* GetTemplate() const; uint32 GetScriptId() const; + ObjectGuid GetCreatorGUID() const override { return GetCasterGuid(); } ObjectGuid GetOwnerGUID() const override { return GetCasterGuid(); } ObjectGuid const& GetCasterGuid() const { return m_areaTriggerData->Caster; } Unit* GetCaster() const; diff --git a/src/server/game/Entities/Conversation/Conversation.h b/src/server/game/Entities/Conversation/Conversation.h index 12a03e7fbb0..276b037c925 100644 --- a/src/server/game/Entities/Conversation/Conversation.h +++ b/src/server/game/Entities/Conversation/Conversation.h @@ -66,8 +66,8 @@ class TC_GAME_API Conversation : public WorldObject, public GridObject<Conversat void AddActor(int32 actorId, uint32 actorIdx, ObjectGuid const& actorGuid); void AddActor(int32 actorId, uint32 actorIdx, ConversationActorType type, uint32 creatureId, uint32 creatureDisplayInfoId); - ObjectGuid const& GetCreatorGuid() const { return _creatorGuid; } - ObjectGuid GetOwnerGUID() const override { return GetCreatorGuid(); } + ObjectGuid GetCreatorGUID() const override { return _creatorGuid; } + ObjectGuid GetOwnerGUID() const override { return GetCreatorGUID(); } uint32 GetFaction() const override { return 0; } float GetStationaryX() const override { return _stationaryPosition.GetPositionX(); } diff --git a/src/server/game/Entities/Corpse/Corpse.h b/src/server/game/Entities/Corpse/Corpse.h index e34b8d73a50..715666e1e37 100644 --- a/src/server/game/Entities/Corpse/Corpse.h +++ b/src/server/game/Entities/Corpse/Corpse.h @@ -94,6 +94,7 @@ class TC_GAME_API Corpse : public WorldObject, public GridObject<Corpse> void RemoveCorpseDynamicFlag(CorpseDynFlags dynamicFlags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(&Corpse::m_corpseData).ModifyValue(&UF::CorpseData::DynamicFlags), dynamicFlags); } void ReplaceAllCorpseDynamicFlags(CorpseDynFlags dynamicFlags) { SetUpdateFieldValue(m_values.ModifyValue(&Corpse::m_corpseData).ModifyValue(&UF::CorpseData::DynamicFlags), dynamicFlags); } + ObjectGuid GetCreatorGUID() const override { return m_corpseData->Owner; } ObjectGuid GetOwnerGUID() const override { return m_corpseData->Owner; } void SetOwnerGUID(ObjectGuid owner) { SetUpdateFieldValue(m_values.ModifyValue(&Corpse::m_corpseData).ModifyValue(&UF::CorpseData::Owner), owner); } void SetPartyGUID(ObjectGuid partyGuid) { SetUpdateFieldValue(m_values.ModifyValue(&Corpse::m_corpseData).ModifyValue(&UF::CorpseData::PartyGUID), partyGuid); } diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.h b/src/server/game/Entities/DynamicObject/DynamicObject.h index 1542280a1f6..ec81ed24fbb 100644 --- a/src/server/game/Entities/DynamicObject/DynamicObject.h +++ b/src/server/game/Entities/DynamicObject/DynamicObject.h @@ -79,6 +79,7 @@ class TC_GAME_API DynamicObject : public WorldObject, public GridObject<DynamicO uint32 GetSpellId() const { return m_dynamicObjectData->SpellID; } SpellInfo const* GetSpellInfo() const; ObjectGuid GetCasterGUID() const { return m_dynamicObjectData->Caster; } + ObjectGuid GetCreatorGUID() const override { return GetCasterGUID(); } ObjectGuid GetOwnerGUID() const override { return GetCasterGUID(); } float GetRadius() const { return m_dynamicObjectData->Radius; } diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index bf54c9cf2a6..9926fd82cca 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -223,6 +223,7 @@ class TC_GAME_API GameObject : public WorldObject, public GridObject<GameObject> bool LoadFromDB(ObjectGuid::LowType spawnId, Map* map, bool addToMap, bool = true); // arg4 is unused, only present to match the signature on Creature static bool DeleteFromDB(ObjectGuid::LowType spawnId); + ObjectGuid GetCreatorGUID() const override { return m_gameObjectData->CreatedBy; } void SetOwnerGUID(ObjectGuid owner) { // Owner already found and different than expected owner - remove object from old owner diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index 379573b643c..f7111fd3abf 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -627,6 +627,7 @@ class TC_GAME_API WorldObject : public Object, public WorldLocation GameObject* FindNearestGameObjectOfType(GameobjectTypes type, float range) const; Player* SelectNearestPlayer(float distance) const; + virtual ObjectGuid GetCreatorGUID() const = 0; virtual ObjectGuid GetOwnerGUID() const = 0; virtual ObjectGuid GetCharmerOrOwnerGUID() const { return GetOwnerGUID(); } ObjectGuid GetCharmerOrOwnerOrOwnGUID() const; diff --git a/src/server/game/Entities/SceneObject/SceneObject.h b/src/server/game/Entities/SceneObject/SceneObject.h index 41c2443c281..0e56c85892f 100644 --- a/src/server/game/Entities/SceneObject/SceneObject.h +++ b/src/server/game/Entities/SceneObject/SceneObject.h @@ -65,6 +65,7 @@ public: bool Create(ObjectGuid::LowType lowGuid, SceneType type, uint32 sceneId, uint32 scriptPackageId, Map* map, Unit* creator, Position const& pos, ObjectGuid privateObjectOwner); + ObjectGuid GetCreatorGUID() const override { return *m_sceneObjectData->CreatedBy; } ObjectGuid GetOwnerGUID() const override { return *m_sceneObjectData->CreatedBy; } uint32 GetFaction() const override { return 0; } |