Merge branch 'master' into Playerbot

# Conflicts:
#	src/server/game/Entities/Creature/Creature.cpp
#	src/server/game/Entities/Creature/Creature.h
#	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
This commit is contained in:
郑佩茹
2022-07-27 09:11:50 -06:00
140 changed files with 6677 additions and 4753 deletions

View File

@@ -682,11 +682,12 @@ void WorldSession::LogoutPlayer(bool save)
_player->GetGroup()->SendUpdate();
_player->GetGroup()->ResetMaxEnchantingLevel();
Map::PlayerList const& playerList = _player->GetMap()->GetPlayers();
if (_player->GetMap()->IsDungeon() || _player->GetMap()->IsRaidOrHeroicDungeon())
{
Map::PlayerList const &playerList = _player->GetMap()->GetPlayers();
if (playerList.IsEmpty())
_player->TeleportToEntryPoint();
}
}
//! Broadcast a logout message to the player's friends