1 files changed, 37 insertions, 33 deletions

diff --git a/src/game/GlobalEvents.cpp b/src/game/GlobalEvents.cpp
index 2781339235d..635d426f694 100644
--- a/src/game/GlobalEvents.cpp
+++ b/src/game/GlobalEvents.cpp
@@ -24,6 +24,7 @@
 
 #include "Log.h"
 #include "Database/DatabaseEnv.h"
+#include "Database/DatabaseImpl.h"
 #include "Platform/Define.h"
 #include "MapManager.h"
 #include "ObjectAccessor.h"
@@ -31,49 +32,52 @@
 #include "ObjectDefines.h"
 #include "Corpse.h"
 
-/// Handle periodic erase of corpses and bones
-static void CorpsesErase(bool bones,uint32 delay)
+static void CorpsesEraseCallBack(QueryResult *result, bool bones)
 {
-    ///- Get the list of eligible corpses/bones to be removed
-    //No SQL injection (uint32 and enum)
-    QueryResult *result = CharacterDatabase.PQuery("SELECT guid,position_x,position_y,map,player FROM corpse WHERE UNIX_TIMESTAMP()-time > '%u' AND corpse_type %s '0'", delay, (bones ? "=" : "<>") );
+    if(!result)
+        return;
 
-    if(result)
+    do
     {
-        do
-        {
-            Field *fields = result->Fetch();
-            uint32 guidlow = fields[0].GetUInt32();
-            float positionX = fields[1].GetFloat();
-            float positionY = fields[2].GetFloat();
-            uint32 mapid    = fields[3].GetUInt32();
-            uint64 player_guid = MAKE_NEW_GUID(fields[4].GetUInt32(), 0, HIGHGUID_PLAYER);
+        Field *fields = result->Fetch();
+        uint32 guidlow = fields[0].GetUInt32();
+        float positionX = fields[1].GetFloat();
+        float positionY = fields[2].GetFloat();
+        uint32 mapid    = fields[3].GetUInt32();
+        uint64 player_guid = MAKE_NEW_GUID(fields[4].GetUInt32(), 0, HIGHGUID_PLAYER);
 
-            uint64 guid = MAKE_NEW_GUID(guidlow, 0, HIGHGUID_CORPSE);
+        uint64 guid = MAKE_NEW_GUID(guidlow, 0, HIGHGUID_CORPSE);
 
-            sLog.outDebug("[Global event] Removing %s %u (X:%f Y:%f Map:%u).",(bones?"bones":"corpse"),guidlow,positionX,positionY,mapid);
+        sLog.outDebug("[Global event] Removing %s %u (X:%f Y:%f Map:%u).",(bones?"bones":"corpse"),guidlow,positionX,positionY,mapid);
 
-            /// Resurrectable - convert corpses to bones
-            if(!bones)
-            {
-                if(!ObjectAccessor::Instance().ConvertCorpseForPlayer(player_guid))
-                {
-                    sLog.outDebug("Corpse %u not found in world. Delete from DB.",guidlow);
-                    CharacterDatabase.PExecute("DELETE FROM corpse WHERE guid = '%u'",guidlow);
-                }
-            }
-            else
-                ///- or delete bones
+        /// Resurrectable - convert corpses to bones
+        if(!bones)
+        {
+            if(!ObjectAccessor::Instance().ConvertCorpseForPlayer(player_guid))
             {
-                MapManager::Instance().RemoveBonesFromMap(mapid, guid, positionX, positionY);
-
-                ///- remove bones from the database
+                sLog.outDebug("Corpse %u not found in world. Delete from DB.",guidlow);
                 CharacterDatabase.PExecute("DELETE FROM corpse WHERE guid = '%u'",guidlow);
             }
-        } while (result->NextRow());
+        }
+        else
+            ///- or delete bones
+        {
+            MapManager::Instance().RemoveBonesFromMap(mapid, guid, positionX, positionY);
+
+            ///- remove bones from the database
+            CharacterDatabase.PExecute("DELETE FROM corpse WHERE guid = '%u'",guidlow);
+        }
+    } while (result->NextRow());
 
-        delete result;
-    }
+    delete result;
+}
+
+/// Handle periodic erase of corpses and bones
+static void CorpsesErase(bool bones,uint32 delay)
+{
+    ///- Get the list of eligible corpses/bones to be removed
+    //No SQL injection (uint32 and enum)
+    CharacterDatabase.AsyncPQuery(&CorpsesEraseCallBack, bones, "SELECT guid,position_x,position_y,map,player FROM corpse WHERE UNIX_TIMESTAMP()-time > '%u' AND corpse_type %s '0'", delay, (bones ? "=" : "<>"));
 }
 
 /// not thread guarded variant for call from other thread