From 245b15d4b9f9c106d6a80deda74e05a5d6a96a1d Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 5 Apr 2025 18:10:28 +0200 Subject: Core/Objects: Support corpses in ObjectAccessor::GetObjectByTypeMask (cherry picked from commit 77fe805d250c23e83026a05019ced4c3d38ccbfb) --- src/server/game/Globals/ObjectAccessor.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp index 23d522cb1bc..520d52b65cf 100644 --- a/src/server/game/Globals/ObjectAccessor.cpp +++ b/src/server/game/Globals/ObjectAccessor.cpp @@ -124,7 +124,7 @@ Object* ObjectAccessor::GetObjectByTypeMask(WorldObject const& p, ObjectGuid con { case HighGuid::Item: if (typemask & TYPEMASK_ITEM && p.GetTypeId() == TYPEID_PLAYER) - return ((Player const&)p).GetItemByGuid(guid); + return static_cast(p).GetItemByGuid(guid); break; case HighGuid::Player: if (typemask & TYPEMASK_PLAYER) @@ -161,6 +161,8 @@ Object* ObjectAccessor::GetObjectByTypeMask(WorldObject const& p, ObjectGuid con return GetConversation(p, guid); break; case HighGuid::Corpse: + if (typemask & TYPEMASK_CORPSE) + return GetCorpse(p, guid); break; default: break; -- cgit v1.2.3