mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-20 09:17:36 +01:00
*A temp fix of the crashes caused by corpses.
--HG-- branch : trunk
This commit is contained in:
@@ -1692,14 +1692,14 @@ void WorldObject::SendObjectDeSpawnAnim(uint64 guid)
|
||||
void WorldObject::SetMap(Map * map)
|
||||
{
|
||||
ASSERT(map);
|
||||
ASSERT(!IsInWorld());
|
||||
ASSERT(!IsInWorld() || GetTypeId() == TYPEID_CORPSE);
|
||||
m_currMap = map;
|
||||
}
|
||||
|
||||
void WorldObject::ResetMap()
|
||||
{
|
||||
ASSERT(m_currMap);
|
||||
ASSERT(!IsInWorld());
|
||||
ASSERT(!IsInWorld() || GetTypeId() == TYPEID_CORPSE);
|
||||
m_currMap = NULL;
|
||||
}
|
||||
|
||||
|
||||
@@ -177,6 +177,10 @@ void LoadHelper(CellCorpseSet const& cell_corpses, CellPair &cell, CorpseMapType
|
||||
if(!obj)
|
||||
continue;
|
||||
|
||||
// TODO: this is a hack
|
||||
// corpse's map should be reset when the map is unloaded
|
||||
obj->SetMap(map);
|
||||
|
||||
AddObjectHelper(cell, m, count, map, obj);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user