From 1f91ccf758566db31eb271221654ec5954cbbacf Mon Sep 17 00:00:00 2001
From: Andrew <47818697+Nyeriah@users.noreply.github.com>
Date: Sun, 1 Mar 2026 22:48:32 -0300
Subject: [PATCH] =?UTF-8?q?fix(Core/Scripting):=20Call=20OnBattlefieldPlay?=
 =?UTF-8?q?erJoinWar()=20before=20adding=20=E2=80=A6=20(#24964)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/Battlefield/Battlefield.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp
index a7235e2c9..708e8462a 100644
--- a/src/server/game/Battlefield/Battlefield.cpp
+++ b/src/server/game/Battlefield/Battlefield.cpp
@@ -434,6 +434,8 @@ void Battlefield::PlayerAcceptInviteToWar(Player* player)
     if (!IsWarTime())
         return;
 
+    sScriptMgr->OnBattlefieldPlayerJoinWar(this, player);
+
     if (AddOrSetPlayerToCorrectBfGroup(player))
     {
         player->GetSession()->SendBfEntered(m_BattleId);
@@ -444,7 +446,6 @@ void Battlefield::PlayerAcceptInviteToWar(Player* player)
             player->ToggleAFK();
 
         OnPlayerJoinWar(player);                               //for scripting
-        sScriptMgr->OnBattlefieldPlayerJoinWar(this, player);
     }
 }