Core/Battlefield: attempt to correctly fix again.

This commit is contained in:
Kandera
2012-08-20 13:48:51 -04:00
parent e9323b2c2d
commit 00f8858838
2 changed files with 4 additions and 2 deletions
@@ -327,6 +327,8 @@ void Battlefield::StartBattle()
void Battlefield::EndBattle(bool endbytimer) void Battlefield::EndBattle(bool endbytimer)
{ {
if (!m_BattlefieldActive)
return false;
m_BattlefieldActive = false; m_BattlefieldActive = false;
m_StartGrouping = false; m_StartGrouping = false;
+2 -2
View File
@@ -61,7 +61,7 @@ public:
Battlefield* bf = sBattlefieldMgr->GetBattlefieldByBattleId(battleid); Battlefield* bf = sBattlefieldMgr->GetBattlefieldByBattleId(battleid);
if (!bf) if (!bf || bf->)
return false; return false;
bf->StartBattle(); bf->StartBattle();
@@ -83,7 +83,7 @@ public:
Battlefield* bf = sBattlefieldMgr->GetBattlefieldByBattleId(battleid); Battlefield* bf = sBattlefieldMgr->GetBattlefieldByBattleId(battleid);
if (!bf || !bf->IsWarTime()) if (!bf)
return false; return false;
bf->EndBattle(true); bf->EndBattle(true);