*Merge.

--HG-- branch : trunk
2009-05-03 10:48:28 -05:00
parent 99cc10d0d7 eb3c3a8fb4
commit 2a725194b6
7 changed files with 21 additions and 15 deletions
@@ -33,7 +33,7 @@ inline void
 Trinity::ObjectUpdater::Visit(CreatureMapType &m)
 {
    for(CreatureMapType::iterator iter=m.begin(); iter != m.end(); ++iter)
-        if(!iter->getSource()->isSpiritService())
+        if(iter->getSource()->IsInWorld() && !iter->getSource()->isSpiritService())
            iter->getSource()->Update(i_timeDiff);
 }