From 6d4eead3a9ca6ac74caa11cdf6fb754ddcc73005 Mon Sep 17 00:00:00 2001
From: ariel- <ariel-@users.noreply.github.com>
Date: Sat, 20 Aug 2016 22:19:49 -0300
Subject: Core/Entities: fix a crash that would happen whenever a player logged
 back in to an ended arena battle. Thanks Nawuko for the input

Closes #17825
---
 src/server/game/Entities/Player/Player.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index e3aec9e462f..dce0d9b6ad7 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -17113,7 +17113,10 @@ bool Player::LoadFromDB(ObjectGuid guid, SQLQueryHolder *holder)
         {
             // leave bg
             if (player_at_bg)
+            {
+                player_at_bg = false;
                 currentBg->RemovePlayerAtLeave(GetGUID(), false, true);
+            }
 
             // Do not look for instance if bg not found
             WorldLocation const& _loc = GetBattlegroundEntryPoint();
-- 
cgit v1.2.3