Do not add a corpse to grid twice. Should fix #3918.

1 files changed, 7 insertions, 0 deletions

diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp
index 28dcd64e3b7..e473fe535a1 100755
--- a/src/server/game/Globals/ObjectAccessor.cpp
+++ b/src/server/game/Globals/ObjectAccessor.cpp
@@ -250,6 +250,13 @@ void ObjectAccessor::AddCorpsesToGrid(GridCoord const& gridpair, GridType& grid,
 
     for (Player2CorpsesMapType::iterator iter = i_player2corpse.begin(); iter != i_player2corpse.end(); ++iter)
     {
+        if (iter->second->IsInGrid())
+        {
+            //TODO: add this assert later
+            //ASSERT(iter->second->GetGridCoord() == gridpair);
+            continue;
+        }
+
         if (iter->second->GetGridCoord() == gridpair)
         {
             // verify, if the corpse in our instance (add only corpses which are)