From 1b8c8209a7328254ce21544d2d905e94eb8a3d75 Mon Sep 17 00:00:00 2001 From: Olion Date: Fri, 9 Oct 2015 16:28:49 +0300 Subject: [PATCH] Disable BG: another way to do --- src/game/BattleGround/BattleGroundHandler.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/game/BattleGround/BattleGroundHandler.cpp b/src/game/BattleGround/BattleGroundHandler.cpp index 8899c16b..68949a3c 100644 --- a/src/game/BattleGround/BattleGroundHandler.cpp +++ b/src/game/BattleGround/BattleGroundHandler.cpp @@ -62,6 +62,12 @@ void WorldSession::HandleBattlemasterHelloOpcode(WorldPacket& recv_data) if (bgTypeId == BATTLEGROUND_TYPE_NONE) { return; } + if (DisableMgr::IsDisabledFor(DISABLE_TYPE_BATTLEGROUND, bgTypeId)) + { + SendNotification(LANG_BG_IS_DISABLED); + return; + } + if (!_player->GetBGAccessByLevel(bgTypeId)) { // temp, must be gossip message... @@ -103,12 +109,6 @@ void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket& recv_data) DEBUG_LOG("WORLD: Received opcode CMSG_BATTLEMASTER_JOIN from %s", guid.GetString().c_str()); - if (DisableMgr::IsDisabledFor(DISABLE_TYPE_BATTLEGROUND, bgTypeId)) - { - ChatHandler(this).SendSysMessage(LANG_BG_IS_DISABLED); - return; - } - // can do this, since it's battleground, not arena BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(bgTypeId);