Misc fixes

2020-08-12 17:44:16 -04:00
parent 459d49f899
commit 2773a4430f
13 changed files with 24 additions and 18 deletions
@@ -95,7 +95,8 @@ namespace Game.Entities
            IsInWorld = true;
            ClearUpdateMask(true);

-            GetMap().GetZoneAndAreaId(_phaseShift, out m_zoneId, out m_areaId, GetPositionX(), GetPositionY(), GetPositionZ());
+            if (GetMap() != null)
+                GetMap().GetZoneAndAreaId(_phaseShift, out m_zoneId, out m_areaId, GetPositionX(), GetPositionY(), GetPositionZ());
        }

        public virtual void RemoveFromWorld()