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

2 files changed, 2 insertions, 2 deletions

diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
index 7a3a1514671..6fafbf823e9 100644
--- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
+++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
@@ -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;
 
diff --git a/src/server/scripts/Commands/cs_bf.cpp b/src/server/scripts/Commands/cs_bf.cpp
index 4eee7c391b0..750550353ec 100644
--- a/src/server/scripts/Commands/cs_bf.cpp
+++ b/src/server/scripts/Commands/cs_bf.cpp
@@ -83,7 +83,7 @@ public:
 
         Battlefield* bf = sBattlefieldMgr->GetBattlefieldByBattleId(battleid);
 
-        if (!bf)
+        if (!bf || !bf->IsWarTime())
             return false;
 
         bf->EndBattle(true);