aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2016-08-20 22:19:49 -0300
committerjoschiwald <joschiwald.trinity@gmail.com>2017-02-12 16:50:26 +0100
commit32bdbb00d0fe15d66c821c1a3c00e4608d933293 (patch)
tree5f2283219c767eca9d0f3dffa5ac83150e995012 /src
parent0925c350e765ce944186d4ba6e30dd6c3063abba (diff)
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 (cherry picked from commit 6d4eead3a9ca6ac74caa11cdf6fb754ddcc73005)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Player/Player.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index a7d46363aa4..1f42f118cb7 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -17357,7 +17357,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();