From 285504e79d25c84b88413fdfad17c2b83fefda86 Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Sat, 2 Apr 2022 00:37:56 +0200 Subject: [PATCH] fix(Core/Object): Fix WorldObject::SetZoneScript unsafe cast to InstanceMap (#11226) * cherry-pick commit (https://github.com/TrinityCore/TrinityCore/commit/e9992066a5ccd7f085a56de09ea027240e8da873) Co-Authored-By: HelloKitty <5829095+HelloKitty@users.noreply.github.com> Co-authored-by: HelloKitty <5829095+HelloKitty@users.noreply.github.com> --- src/server/game/Entities/Object/Object.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 0efc46222..d22df812a 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -2272,8 +2272,8 @@ void WorldObject::SetZoneScript() { if (Map* map = FindMap()) { - if (map->IsDungeon()) - m_zoneScript = (ZoneScript*)map->ToInstanceMap()->GetInstanceScript(); + if (InstanceMap* instanceMap = map->ToInstanceMap()) + m_zoneScript = reinterpret_cast(instanceMap->GetInstanceScript()); else if (!map->IsBattlegroundOrArena()) { uint32 zoneId = GetZoneId();