Skip to content

Fix: Improve LoadHelper stability with null check and debug logging #752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maxxbox81 wants to merge 1 commit into
base: master
Choose a base branch
from
+27 −13
Open

Fix: Improve LoadHelper stability with null check and debug logging #752

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 27 additions & 13 deletions src/game/Grids/ObjectGridLoader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,47 +118,61 @@ void LoadHelper(CellGuidSet const& guid_set, CellPair& cell, GridRefManager<T>&

for (uint32 guid : guid_set)
{
T* obj;
T* obj = nullptr;
uint32 newGuid = guid;
if constexpr (std::is_same_v<T, GameObject>)
{
GameObjectData const* data = sObjectMgr.GetGOData(guid);
MANGOS_ASSERT(data);
obj = (T*)GameObject::CreateGameObject(data->id);
obj = static_cast<T*>(GameObject::CreateGameObject(data->id));
if (map->GetSpawnManager().IsEventGuid(guid, HIGHGUID_GAMEOBJECT))
newGuid = 0;
}
else
{
obj = new T;
obj = new T();
if (map->GetSpawnManager().IsEventGuid(guid, HIGHGUID_UNIT))
newGuid = 0;
}
// sLog.outString("DEBUG: LoadHelper from table: %s for (guid: %u) Loading",table,guid);
if (!obj->LoadFromDB(guid, map, newGuid, 0))
if (!obj || !obj->LoadFromDB(guid, map, newGuid, 0))
{
delete obj;
continue;
}

// Set cell info (used also by creatures)
addUnitState(obj, cell);

// Only gameobjects are added to grid here
if (!obj->IsCreature())
{
grid.AddGridObject(obj);

// Check whether object is correctly in world
if (!obj->IsInWorld())
{
#ifdef MANGOS_DEBUG
const float x = obj->GetPositionX();
const float y = obj->GetPositionY();
const float z = obj->GetPositionZ();
const bool isEventGuid = map->GetSpawnManager().IsEventGuid(guid, obj->GetObjectGuid().GetHigh());

sLog.outError("LoadHelper - %s (guid: %u%s) has been loaded, but is not in the world! map=%u, x=%.2f, y=%.2f, z=%.2f",
typeid(*obj).name(),
obj->GetObjectGuid().GetCounter(),
isEventGuid ? " [EventGuid]" : "",
map->GetId(), x, y, z);
#endif

addUnitState(obj, cell);
delete obj;
continue;
}

// if this assert is hit we have a problem somewhere because LoadFromDb should already add to map due to AI
MANGOS_ASSERT(obj->IsInWorld());

obj->GetViewPoint().Event_AddedToWorld(&grid);

if (bg)
bg->OnObjectDBLoad(obj);

++count;
}
}
}

void LoadHelper(CellCorpseSet const& cell_corpses, CellPair& cell, CorpseMapType& /*m*/, uint32& count, Map* map, GridType& grid)
{
Expand Down