aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
authorKandera <KanderaDev@gmail.com>2012-03-09 09:39:28 -0500
committerKandera <KanderaDev@gmail.com>2012-08-20 13:48:51 -0400
commit00f88588380f5372cb66e31b67dae56e9da44de5 (patch)
treed6a7b14a15a36c4e0bcb1fd640fd69637ac7a6a2 /src/server/game
parente9323b2c2def116360b987532ae7634fcd116122 (diff)
Core/Battlefield: attempt to correctly fix again.
Diffstat (limited to 'src/server/game')
-rw-r--r--src/server/game/Battlefield/Battlefield.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp
index 501351f2e4d..e55000df320 100644
--- a/src/server/game/Battlefield/Battlefield.cpp
+++ b/src/server/game/Battlefield/Battlefield.cpp
@@ -327,6 +327,8 @@ void Battlefield::StartBattle()
void Battlefield::EndBattle(bool endbytimer)
{
+ if (!m_BattlefieldActive)
+ return false;
m_BattlefieldActive = false;
m_StartGrouping = false;