nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-26 15:16:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Shutdown): add checks to see if MapUpdater threads are joineable (#7450)

Browse Source
This commit is contained in:
Petric
2021-11-24 10:41:49 +00:00
committed by GitHub
parent fc16abc30e
commit 11373cd78a
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Maps/Map.cpp
View File

@@ -69,7 +69,7 @@ Map::~Map()
{
WorldObject* obj = *i_worldObjects.begin();
ASSERT(obj->IsWorldObject());
LOG_ERROR("maps", "Map::~Map: WorldObject TypeId is not a corpse! (%u)", static_cast<uint8>(obj->GetTypeId()));
LOG_DEBUG("maps", "Map::~Map: WorldObject TypeId is not a corpse! (%u)", static_cast<uint8>(obj->GetTypeId()));
//ASSERT(obj->GetTypeId() == TYPEID_CORPSE);
obj->RemoveFromWorld();
obj->ResetMap();

5
src/server/game/Maps/MapUpdater.cpp
View File

@@ -74,11 +74,6 @@ MapUpdater::MapUpdater(): pending_requests(0)
{
}
MapUpdater::~MapUpdater()
{
deactivate();
}
void MapUpdater::activate(size_t num_threads)
{
_workerThreads.reserve(num_threads);

2
src/server/game/Maps/MapUpdater.h
View File

@@ -31,7 +31,7 @@ class MapUpdater
{
public:
MapUpdater();
virtual ~MapUpdater();
~MapUpdater() = default;
void schedule_update(Map& map, uint32 diff, uint32 s_diff);
void schedule_lfg_update(uint32 diff);

1
src/server/game/World/World.cpp
View File

@@ -2119,6 +2119,7 @@ void World::SetInitialWorldSettings()
if (sConfigMgr->isDryRun())
{
sMapMgr->UnloadAll();
LOG_INFO("server.loading", "AzerothCore dry run completed, terminating.");
exit(0);
}