diff options
| author | Kandera <KanderaDev@gmail.com> | 2012-03-09 09:39:28 -0500 |
|---|---|---|
| committer | Kandera <KanderaDev@gmail.com> | 2012-08-20 13:48:51 -0400 |
| commit | 00f88588380f5372cb66e31b67dae56e9da44de5 (patch) | |
| tree | d6a7b14a15a36c4e0bcb1fd640fd69637ac7a6a2 | |
| parent | e9323b2c2def116360b987532ae7634fcd116122 (diff) | |
Core/Battlefield: attempt to correctly fix again.
| -rw-r--r-- | src/server/game/Battlefield/Battlefield.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_bf.cpp | 4 |
2 files changed, 4 insertions, 2 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; diff --git a/src/server/scripts/Commands/cs_bf.cpp b/src/server/scripts/Commands/cs_bf.cpp index 750550353ec..d410ae890f9 100644 --- a/src/server/scripts/Commands/cs_bf.cpp +++ b/src/server/scripts/Commands/cs_bf.cpp @@ -61,7 +61,7 @@ public: Battlefield* bf = sBattlefieldMgr->GetBattlefieldByBattleId(battleid); - if (!bf) + if (!bf || bf->) return false; bf->StartBattle(); @@ -83,7 +83,7 @@ public: Battlefield* bf = sBattlefieldMgr->GetBattlefieldByBattleId(battleid); - if (!bf || !bf->IsWarTime()) + if (!bf) return false; bf->EndBattle(true); |