Merge branch 'master' into Playerbot

# Conflicts:
#	src/server/game/Entities/GameObject/GameObject.h
This commit is contained in:
郑佩茹
2023-02-13 13:07:03 -07:00
312 changed files with 6400 additions and 4718 deletions

View File

@@ -80,7 +80,7 @@ namespace lfg
sLFGMgr->InitializeLockedDungeons(player, group);
sLFGMgr->SetTeam(player->GetGUID(), player->GetTeamId());
// TODO - Restore LfgPlayerData and send proper status to player if it was in a group
/// @todo - Restore LfgPlayerData and send proper status to player if it was in a group
}
void LFGPlayerScript::OnBindToInstance(Player* player, Difficulty difficulty, uint32 mapId, bool /*permanent*/)