ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

fix(Core/Maps): Fix instance factions (#21577)

Browse source
This commit is contained in:
Takenbacon 2025-02-21 11:49:39 -08:00 • committed by GitHub
parent 0161a611ef
commit d145b866a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 26 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/server/game/Maps/Map.cpp
View file

@ -2206,15 +2206,6 @@ bool InstanceMap::AddPlayerToMap(Player* player)
m_resetAfterUnload = false;
m_unloadWhenEmpty = false;
if (instance_data && instance_data->IsTwoFactionInstance()
&& instance_data->GetTeamIdInInstance() == TEAM_NEUTRAL)
{
instance_data->SetTeamIdInInstance(player->GetTeamId());
if (Group* group = player->GetGroup())
if (Player* leader = ObjectAccessor::FindConnectedPlayer(group->GetLeaderGUID()))
instance_data->SetTeamIdInInstance(leader->GetTeamId());
}
// this will acquire the same mutex so it cannot be in the previous block
Map::AddPlayerToMap(player);