*Merge.

--HG-- branch : trunk
2009-03-05 09:17:57 -06:00
parent 19ce0bb39f 465b10fc60
commit c1ea842cf7
13 changed files with 180 additions and 115 deletions
@@ -381,6 +381,8 @@ class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::O
            if(m_activeNonPlayersIter != m_activeNonPlayers.end())
            {
                ActiveNonPlayers::iterator itr = m_activeNonPlayers.find(obj);
+                if(itr == m_activeNonPlayers.end())
+                    return;
                if(itr==m_activeNonPlayersIter)
                    ++m_activeNonPlayersIter;
                m_activeNonPlayers.erase(itr);