fix(Core): Entering BG whilst in combat (#12770)
This commit is contained in:
committed by
GitHub
parent
0a0072fe0f
commit
431d7d5e4d
@@ -403,6 +403,12 @@ void WorldSession::HandleBattleFieldPortOpcode(WorldPacket& recvData)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_player->GetCharmGUID() || _player->IsInCombat())
|
||||||
|
{
|
||||||
|
_player->GetSession()->SendNotification(LANG_YOU_IN_COMBAT);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// get BattlegroundQueue for received
|
// get BattlegroundQueue for received
|
||||||
BattlegroundTypeId bgTypeId = BattlegroundTypeId(bgTypeId_);
|
BattlegroundTypeId bgTypeId = BattlegroundTypeId(bgTypeId_);
|
||||||
BattlegroundQueueTypeId bgQueueTypeId = BattlegroundMgr::BGQueueTypeId(bgTypeId, arenaType);
|
BattlegroundQueueTypeId bgQueueTypeId = BattlegroundMgr::BGQueueTypeId(bgTypeId, arenaType);
|
||||||
|
|||||||
Reference in New Issue
Block a user