nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-14 16:03:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Instances): Ensure team is acquired before spawning creatures (#21221)

Browse Source
This commit is contained in:
Andrew
2025-01-21 20:13:22 -03:00
committed by GitHub
parent 0733c30471
commit d851f97f40
3 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/server/game/Instances/InstanceScript.cpp
View File

@@ -57,23 +57,7 @@ void InstanceScript::SaveToDB()
void InstanceScript::OnPlayerEnter(Player* player)
{
if (!IsTwoFactionInstance())
return;
if (GetTeamIdInInstance() == TEAM_NEUTRAL)
{
if (Group* group = player->GetGroup())
{
if (Player* leader = ObjectAccessor::FindConnectedPlayer(group->GetLeaderGUID()))
_teamIdInInstance = leader->GetTeamId();
else
_teamIdInInstance = player->GetTeamId();
}
else
_teamIdInInstance = player->GetTeamId();
}
if (sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GROUP))
if (sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GROUP) && IsTwoFactionInstance())
player->SetFaction((_teamIdInInstance == TEAM_HORDE) ? 1610 /*FACTION_HORDE*/ : 1 /*FACTION_ALLIANCE*/);
}