aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2016-08-20 22:19:49 -0300
committerariel- <ariel-@users.noreply.github.com>2016-08-20 22:19:49 -0300
commit6d4eead3a9ca6ac74caa11cdf6fb754ddcc73005 (patch)
tree8bad991e7934c51c59a636f08863a1d04ec86b87
parent1deb7d2df178a98bc1b1cde2ca99301e7ee85ecb (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
-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 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();