From cd27fd38b93884797c094a82dc7beb0498e2f124 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Mon, 28 Sep 2015 17:20:27 +0200
Subject: Core/Maps: Moved corpse management to map level

---
 src/server/scripts/Commands/cs_instance.cpp         | 4 ++--
 src/server/scripts/Commands/cs_misc.cpp             | 8 +++++---
 src/server/scripts/Commands/cs_reload.cpp           | 1 -
 src/server/scripts/Commands/cs_server.cpp           | 2 +-
 src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'src/server/scripts')

diff --git a/src/server/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp
index 6e82c4fbd1a..836d4caa22b 100644
--- a/src/server/scripts/Commands/cs_instance.cpp
+++ b/src/server/scripts/Commands/cs_instance.cpp
@@ -217,7 +217,7 @@ public:
         {
             playerName = param3;
             if (normalizePlayerName(playerName))
-                player = sObjectAccessor->FindPlayerByName(playerName);
+                player = ObjectAccessor::FindPlayerByName(playerName);
         }
 
         if (!player)
@@ -283,7 +283,7 @@ public:
         {
             playerName = param2;
             if (normalizePlayerName(playerName))
-                player = sObjectAccessor->FindPlayerByName(playerName);
+                player = ObjectAccessor::FindPlayerByName(playerName);
         }
 
         if (!player)
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index 400ef88ff67..73fab358f38 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -620,8 +620,10 @@ public:
             target->SaveToDB();
         }
         else
-            // will resurrected at login without corpse
-            sObjectAccessor->ConvertCorpseForPlayer(targetGuid);
+        {
+            SQLTransaction trans(nullptr);
+            Player::OfflineResurrect(targetGuid, trans);
+        }
 
         return true;
     }
@@ -842,7 +844,7 @@ public:
     // Save all players in the world
     static bool HandleSaveAllCommand(ChatHandler* handler, char const* /*args*/)
     {
-        sObjectAccessor->SaveAllPlayers();
+        ObjectAccessor::SaveAllPlayers();
         handler->SendSysMessage(LANG_PLAYERS_SAVED);
         return true;
     }
diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp
index c3ba942ef1f..be025ea7180 100644
--- a/src/server/scripts/Commands/cs_reload.cpp
+++ b/src/server/scripts/Commands/cs_reload.cpp
@@ -1117,7 +1117,6 @@ public:
     {
         TC_LOG_INFO("misc", "Reloading terrain_phase_info table...");
         sObjectMgr->LoadTerrainPhaseInfo();
-        sWorld->UpdatePhaseDefinitions();
         handler->SendGlobalGMSysMessage("Terrain phase infos reloaded.");
         return true;
     }
diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp
index e65ac5f2105..15078e4cc78 100644
--- a/src/server/scripts/Commands/cs_server.cpp
+++ b/src/server/scripts/Commands/cs_server.cpp
@@ -100,7 +100,7 @@ public:
     // Triggering corpses expire check in world
     static bool HandleServerCorpsesCommand(ChatHandler* /*handler*/, char const* /*args*/)
     {
-        sObjectAccessor->RemoveOldCorpses();
+        sWorld->RemoveOldCorpses();
         return true;
     }
 
diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
index 74686f23721..b831f83dc41 100644
--- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
@@ -527,7 +527,7 @@ public:
                         case PHASE_PLANT_FIRST_DETONATE: // first explosives detonate finish
                             for (GuidList::iterator itr = _explosivesGuids.begin(); itr != _explosivesGuids.end(); ++itr)
                             {
-                                if (GameObject* explosive = sObjectAccessor->GetGameObject(*me, *itr))
+                                if (GameObject* explosive = ObjectAccessor::GetGameObject(*me, *itr))
                                     me->RemoveGameObject(explosive, true);
                             }
                             _explosivesGuids.clear();
@@ -624,7 +624,7 @@ public:
                         case PHASE_PLANT_SECOND_DETONATE: // second explosives detonate finish
                             for (GuidList::iterator itr = _explosivesGuids.begin(); itr != _explosivesGuids.end(); ++itr)
                             {
-                                if (GameObject* explosive = sObjectAccessor->GetGameObject(*me, *itr))
+                                if (GameObject* explosive = ObjectAccessor::GetGameObject(*me, *itr))
                                     me->RemoveGameObject(explosive, true);
                             }
                             _explosivesGuids.clear();
-- 
cgit v1.2.3