Merge branch 'azerothcore:master' into Playerbot

This commit is contained in:
ZhengPeiRu21
2022-09-22 15:18:27 -06:00
committed by GitHub
20 changed files with 6130 additions and 115 deletions

View File

@@ -187,6 +187,10 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket& recvData)
{
err = ERR_BATTLEGROUND_NONE;
}
else if (!_player->GetBGAccessByLevel(bgTypeId))
{
err = ERR_BATTLEGROUND_NONE;
}
if (err <= 0)
{
@@ -236,6 +240,10 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket& recvData)
{
err = ERR_BATTLEGROUND_NONE;
}
else if (!member->GetBGAccessByLevel(bgTypeId))
{
err = ERR_BATTLEGROUND_JOIN_TIMED_OUT;
}
if (err < 0)
{