aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2024-03-26 21:53:07 +0100
committerfunjoker <funjoker109@gmail.com>2024-03-28 20:27:15 +0100
commit8a673d7a0f128a0dfcfbea5be6ef486442ada19b (patch)
tree401505a08b99893fac68762d6b6727dab5d618ba /src
parent7366756843f3c823195a8aaac6aff69abfd44e65 (diff)
Core/Maps: Initialize instance faction using group leader (if available) instead of the first player entering the map
(cherry picked from commit 679bf966d6db438f4a614e27529ecc29d37a918c)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Maps/MapManager.cpp3
1 files changed, 2 insertions, 1 deletions
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