josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kandera
2012-08-20 13:48:50 -04:00
parent 29343947e9
commit e9323b2c2d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Battlefield/Zones/BattlefieldWG.cpp
+1 -1
View File
@@ -321,7 +321,7 @@ void BattlefieldWG::UpdateCounterVehicle(bool init)
void BattlefieldWG::OnBattleEnd(bool endbytimer) void BattlefieldWG::OnBattleEnd(bool endbytimer)
{ {
// Remove relic // Remove relic
if (m_relic && m_relic->isSpawned()) if (m_relic)
m_relic->RemoveFromWorld(); m_relic->RemoveFromWorld();
m_relic = NULL; m_relic = NULL;
src/server/scripts/Commands/cs_bf.cpp
+1 -1
View File
@@ -83,7 +83,7 @@ public:
Battlefield* bf = sBattlefieldMgr->GetBattlefieldByBattleId(battleid); Battlefield* bf = sBattlefieldMgr->GetBattlefieldByBattleId(battleid);
if (!bf) if (!bf || !bf->IsWarTime())
return false; return false;
bf->EndBattle(true); bf->EndBattle(true);