Core/Battlefield: attempt to fix crashes. please test and confirm

This commit is contained in:
Kandera
2012-08-20 13:48:50 -04:00
parent f9c9622f86
commit 29343947e9
2 changed files with 2 additions and 2 deletions
@@ -321,7 +321,7 @@ void BattlefieldWG::UpdateCounterVehicle(bool init)
void BattlefieldWG::OnBattleEnd(bool endbytimer)
{
// Remove relic
if (m_relic)
if (m_relic && m_relic->isSpawned())
m_relic->RemoveFromWorld();
m_relic = NULL;
@@ -1607,7 +1607,7 @@ struct WGWorkshop
WGWorkshop(BattlefieldWG* _bf, uint8 _workshopId)
{
ASSERT(bf);
ASSERT(_bf);
ASSERT(_workshopId < WG_MAX_WORKSHOP);
bf = _bf;