mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-30 05:43:12 +01:00
Core/Battlefield: revert part of previous commit and correctly fix .bf stop crashing
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
@@ -83,7 +83,7 @@ public:
|
||||
|
||||
Battlefield* bf = sBattlefieldMgr->GetBattlefieldByBattleId(battleid);
|
||||
|
||||
if (!bf)
|
||||
if (!bf || !bf->IsWarTime())
|
||||
return false;
|
||||
|
||||
bf->EndBattle(true);
|
||||
|
||||
Reference in New Issue
Block a user