Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 19:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-04-08 17:34:01 -05:00
parent d6be48326f a7e04a252f
commit e3272f2b0a
7 changed files with 74 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/Object.cpp
View File

@@ -1674,7 +1674,9 @@ Map const* WorldObject::GetBaseMap() const
void WorldObject::AddObjectToRemoveList()
{
Map* map = MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
assert(m_uint32Values);
Map* map = FindMap();
if(!map)
{
sLog.outError("Object (TypeId: %u Entry: %u GUID: %u) at attempt add to move list not have valid map (Id: %u).",GetTypeId(),GetEntry(),GetGUIDLow(),GetMapId());