Core/Battlefield: attempt to correctly fix again.
This commit is contained in:
@@ -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;
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
Reference in New Issue
Block a user