Core/Battlefield: revert part of previous commit and correctly fix .bf stop crashing

This commit is contained in:
Kandera
2012-03-09 09:37:05 -05:00
parent 29343947e9
commit e9323b2c2d
2 changed files with 2 additions and 2 deletions

View File

@@ -321,7 +321,7 @@ void BattlefieldWG::UpdateCounterVehicle(bool init)
void BattlefieldWG::OnBattleEnd(bool endbytimer)
{
// Remove relic
if (m_relic && m_relic->isSpawned())
if (m_relic)
m_relic->RemoveFromWorld();
m_relic = NULL;

View File

@@ -83,7 +83,7 @@ public:
Battlefield* bf = sBattlefieldMgr->GetBattlefieldByBattleId(battleid);
if (!bf)
if (!bf || !bf->IsWarTime())
return false;
bf->EndBattle(true);