Core/Maps: Fixes nulls which unloading instance maps.

This commit is contained in:
hondacrx
2018-05-26 13:12:28 -04:00
parent 41bce64ffc
commit d94ad385b1
3 changed files with 29 additions and 24 deletions
+5 -4
View File
@@ -45,17 +45,17 @@ namespace Game.Maps
{
base.Update(diff);
foreach (var i in m_InstancedMaps.ToList())
foreach (var pair in m_InstancedMaps.ToList())
{
if (i.Value.CanUnload(diff))
if (pair.Value.CanUnload(diff))
{
if (!DestroyInstance(i))
if (!DestroyInstance(pair))
{
//m_unloadTimer
}
}
else
i.Value.Update(diff);
pair.Value.Update(diff);
}
}
@@ -265,6 +265,7 @@ namespace Game.Maps
Global.MapMgr.FreeInstanceId(pair.Value.GetInstanceId());
// erase map
pair.Value.Dispose();
m_InstancedMaps.Remove(pair.Key);
return true;