From 431d7d5e4d5d70e6fc9ae22d838df5c3fb8ecfdc Mon Sep 17 00:00:00 2001
From: IntelligentQuantum <IntelligentQuantum@ProtonMail.Com>
Date: Tue, 6 Sep 2022 22:52:01 +0430
Subject: [PATCH] fix(Core): Entering BG whilst in combat (#12770)

---
 src/server/game/Handlers/BattleGroundHandler.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp
index 7e76aa6e4..585927819 100644
--- a/src/server/game/Handlers/BattleGroundHandler.cpp
+++ b/src/server/game/Handlers/BattleGroundHandler.cpp
@@ -403,6 +403,12 @@ void WorldSession::HandleBattleFieldPortOpcode(WorldPacket& recvData)
         return;
     }
 
+    if (_player->GetCharmGUID() || _player->IsInCombat())
+    {
+        _player->GetSession()->SendNotification(LANG_YOU_IN_COMBAT);
+        return;
+    }
+
     // get BattlegroundQueue for received
     BattlegroundTypeId bgTypeId = BattlegroundTypeId(bgTypeId_);
     BattlegroundQueueTypeId bgQueueTypeId = BattlegroundMgr::BGQueueTypeId(bgTypeId, arenaType);