From 8a673d7a0f128a0dfcfbea5be6ef486442ada19b Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 26 Mar 2024 21:53:07 +0100 Subject: Core/Maps: Initialize instance faction using group leader (if available) instead of the first player entering the map (cherry picked from commit 679bf966d6db438f4a614e27529ecc29d37a918c) --- src/server/game/Maps/MapManager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/server') diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index 544aba6702b..87f2bbe160a 100644 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -18,6 +18,7 @@ #include "MapManager.h" #include "BattlefieldMgr.h" #include "Battleground.h" +#include "CharacterCache.h" #include "Containers.h" #include "DatabaseEnv.h" #include "DB2Stores.h" @@ -214,7 +215,7 @@ Map* MapManager::CreateMap(uint32 mapId, Player* player) if (!map) { - map = CreateInstance(mapId, newInstanceId, instanceLock, difficulty, player->GetTeamId(), group); + map = CreateInstance(mapId, newInstanceId, instanceLock, difficulty, GetTeamIdForTeam(sCharacterCache->GetCharacterTeamByGuid(instanceOwnerGuid)), group); if (group) group->SetRecentInstance(mapId, instanceOwnerGuid, newInstanceId); else -- cgit v1.2.3