From 9bbf3e9493bea8e7195ebef3a18a2e6a64be2914 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Tue, 25 Nov 2008 21:25:52 -0600
Subject: *Fix build. *Fix the bug that janalai summons too many adds.

--HG--
branch : trunk
---
 src/game/DynamicObject.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/game/DynamicObject.cpp')

diff --git a/src/game/DynamicObject.cpp b/src/game/DynamicObject.cpp
index b61b6654167..50539796ab3 100644
--- a/src/game/DynamicObject.cpp
+++ b/src/game/DynamicObject.cpp
@@ -140,7 +140,13 @@ void DynamicObject::Delete()
     // are switched to world container on creation and they are also set to active
     if (isActive())
     {
-        GetMap()->SwitchGridContainers(this, false);
+        Map* map = GetMap();
+        if(!map)
+        {
+            sLog.outError("DynamicObject (TypeId: %u Entry: %u GUID: %u) at attempt add to move list not have valid map (Id: %u).",GetTypeId(),GetEntry(),GetGUIDLow(),GetMapId());
+            return;
+        }
+        map->SwitchGridContainers(this, false);
         setActive(false);
     }
     SendObjectDeSpawnAnim(GetGUID());
-- 
cgit v1.2.3