Core/Maps: Unload transports in MapManager::UnloadAll instead of singleton destructor.
Core/Transports: Properly delink units from transports on transport desutruction. - Thanks to Shauren for help. Core/ObjectAccessor: Unload corpse 'storage' in added UnloadAll method called in WorldRunnable postservice hook. Core/Master: Change some postservice queries to syncrhonous (direct) execution to ensure execution on shutdown Core/Master: Remove redundant calls to ACE::init and ACE::fini These changes were made to fix crash/freeze issues on shutdown.
This commit is contained in:
1 parent
58564cc496
commit
52cd2cbd7e
7 files changed
+37
-33
No files matched your search
@@ -45,16 +45,6 @@ MapManager::MapManager()
|
||||
|
||||
MapManager::~MapManager()
|
||||
{
|
||||
for (MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter)
|
||||
delete iter->second;
|
||||
|
||||
for (TransportSet::iterator i = m_Transports.begin(); i != m_Transports.end(); ++i)
|
||||
{
|
||||
(*i)->RemoveFromWorld();
|
||||
delete *i;
|
||||
}
|
||||
|
||||
Map::DeleteStateMachine();
|
||||
}
|
||||
|
||||
void MapManager::Initialize()
|
||||
@@ -305,17 +295,23 @@ bool MapManager::IsValidMAP(uint32 mapid)
|
||||
|
||||
void MapManager::UnloadAll()
|
||||
{
|
||||
for (MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter)
|
||||
iter->second->UnloadAll();
|
||||
|
||||
while (!i_maps.empty())
|
||||
for (TransportSet::iterator i = m_Transports.begin(); i != m_Transports.end(); ++i)
|
||||
{
|
||||
delete i_maps.begin()->second;
|
||||
i_maps.erase(i_maps.begin());
|
||||
(*i)->RemoveFromWorld();
|
||||
delete *i;
|
||||
}
|
||||
|
||||
for (MapMapType::iterator iter = i_maps.begin(); iter != i_maps.end();)
|
||||
{
|
||||
iter->second->UnloadAll();
|
||||
delete iter->second;
|
||||
i_maps.erase(iter++);
|
||||
}
|
||||
|
||||
if (m_updater.activated())
|
||||
m_updater.deactivate();
|
||||
|
||||
Map::DeleteStateMachine();
|
||||
}
|
||||
|
||||
void MapManager::InitMaxInstanceId()
|
||||
|
||||
Reference in new issue
Block a user