Core: Get rid of dirty operator workaround for ACE_Singleton class implementation

--HG--
branch : trunk

31 files changed, 260 insertions, 260 deletions

diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp
index 8641d70ceb4..122d034e86e 100644
--- a/src/server/scripts/Commands/cs_account.cpp
+++ b/src/server/scripts/Commands/cs_account.cpp
@@ -99,11 +99,11 @@ public:
         if (!szAcc || !szPassword)
             return false;
 
-        // normalized in sAccountMgr.CreateAccount
+        // normalized in sAccountMgr->CreateAccount
         std::string account_name = szAcc;
         std::string password = szPassword;
 
-        AccountOpResult result = sAccountMgr.CreateAccount(account_name, password);
+        AccountOpResult result = sAccountMgr->CreateAccount(account_name, password);
         switch(result)
         {
         case AOR_OK:
@@ -150,7 +150,7 @@ public:
             return false;
         }
 
-        uint32 account_id = sAccountMgr.GetId(account_name);
+        uint32 account_id = sAccountMgr->GetId(account_name);
         if (!account_id)
         {
             handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
@@ -164,7 +164,7 @@ public:
         if (handler->HasLowerSecurityAccount (NULL,account_id,true))
             return false;
 
-        AccountOpResult result = sAccountMgr.DeleteAccount(account_id);
+        AccountOpResult result = sAccountMgr->DeleteAccount(account_id);
         switch(result)
         {
         case AOR_OK:
@@ -286,7 +286,7 @@ public:
         std::string password_new = new_pass;
         std::string password_new_c = new_pass_c;
 
-        if (!sAccountMgr.CheckPassword(handler->GetSession()->GetAccountId(), password_old))
+        if (!sAccountMgr->CheckPassword(handler->GetSession()->GetAccountId(), password_old))
         {
             handler->SendSysMessage(LANG_COMMAND_WRONGOLDPASSWORD);
             handler->SetSentErrorMessage(true);
@@ -300,7 +300,7 @@ public:
             return false;
         }
 
-        AccountOpResult result = sAccountMgr.ChangePassword(handler->GetSession()->GetAccountId(), password_new);
+        AccountOpResult result = sAccountMgr->ChangePassword(handler->GetSession()->GetAccountId(), password_new);
         switch(result)
         {
         case AOR_OK:
@@ -346,7 +346,7 @@ public:
                 return false;
 
             account_id = player->GetSession()->GetAccountId();
-            sAccountMgr.GetName(account_id,account_name);
+            sAccountMgr->GetName(account_id,account_name);
             szExp = szAcc;
         }
         else
@@ -360,7 +360,7 @@ public:
                 return false;
             }
 
-            account_id = sAccountMgr.GetId(account_name);
+            account_id = sAccountMgr->GetId(account_name);
             if (!account_id)
             {
                 handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
@@ -433,17 +433,17 @@ public:
         }
 
         // handler->getSession() == NULL only for console
-        targetAccountId = (isAccountNameGiven) ? sAccountMgr.GetId(targetAccountName) : handler->getSelectedPlayer()->GetSession()->GetAccountId();
+        targetAccountId = (isAccountNameGiven) ? sAccountMgr->GetId(targetAccountName) : handler->getSelectedPlayer()->GetSession()->GetAccountId();
         int32 gmRealmID = (isAccountNameGiven) ? atoi(arg3) : atoi(arg2);
         uint32 plSecurity;
         if (handler->GetSession())
-            plSecurity = sAccountMgr.GetSecurity(handler->GetSession()->GetAccountId(), gmRealmID);
+            plSecurity = sAccountMgr->GetSecurity(handler->GetSession()->GetAccountId(), gmRealmID);
         else
             plSecurity = SEC_CONSOLE;
 
         // can set security level only for target with less security and to less security that we have
         // This is also reject self apply in fact
-        targetSecurity = sAccountMgr.GetSecurity(targetAccountId, gmRealmID);
+        targetSecurity = sAccountMgr->GetSecurity(targetAccountId, gmRealmID);
         if (targetSecurity >= plSecurity || gm >= plSecurity)
         {
             handler->SendSysMessage(LANG_YOURS_SECURITY_IS_LOW);
@@ -505,7 +505,7 @@ public:
             return false;
         }
 
-        uint32 targetAccountId = sAccountMgr.GetId(account_name);
+        uint32 targetAccountId = sAccountMgr->GetId(account_name);
         if (!targetAccountId)
         {
             handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
@@ -525,7 +525,7 @@ public:
             return false;
         }
 
-        AccountOpResult result = sAccountMgr.ChangePassword(targetAccountId, szPassword1);
+        AccountOpResult result = sAccountMgr->ChangePassword(targetAccountId, szPassword1);
 
         switch (result)
         {
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index cc041f08ced..bb3374234f3 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -723,13 +723,13 @@ public:
 
     static bool HandleDebugBattlegroundCommand(ChatHandler* /*handler*/, const char* /*args*/)
     {
-        sBattlegroundMgr.ToggleTesting();
+        sBattlegroundMgr->ToggleTesting();
         return true;
     }
 
     static bool HandleDebugArenaCommand(ChatHandler* /*handler*/, const char* /*args*/)
     {
-        sBattlegroundMgr.ToggleArenaTesting();
+        sBattlegroundMgr->ToggleArenaTesting();
         return true;
     }
 
@@ -865,7 +865,7 @@ public:
 
         Map *map = handler->GetSession()->GetPlayer()->GetMap();
 
-        if (!v->Create(sObjectMgr.GenerateLowGuid(HIGHGUID_VEHICLE), map, handler->GetSession()->GetPlayer()->GetPhaseMask(), entry, id, handler->GetSession()->GetPlayer()->GetTeam(), x, y, z, o))
+        if (!v->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_VEHICLE), map, handler->GetSession()->GetPlayer()->GetPhaseMask(), entry, id, handler->GetSession()->GetPlayer()->GetTeam(), x, y, z, o))
         {
             delete v;
             return false;
@@ -971,7 +971,7 @@ public:
             return false;
 
         handler->GetSession()->GetPlayer()->DestroyItem(i->GetBagSlot(), i->GetSlot(), true);
-        sScriptMgr.OnItemExpire(handler->GetSession()->GetPlayer(), i->GetProto());
+        sScriptMgr->OnItemExpire(handler->GetSession()->GetPlayer(), i->GetProto());
 
         return true;
     }
diff --git a/src/server/scripts/Commands/cs_event.cpp b/src/server/scripts/Commands/cs_event.cpp
index 2ef88bf8738..24721760460 100644
--- a/src/server/scripts/Commands/cs_event.cpp
+++ b/src/server/scripts/Commands/cs_event.cpp
@@ -53,8 +53,8 @@ public:
     {
         uint32 counter = 0;
 
-        GameEventMgr::GameEventDataMap const& events = sGameEventMgr.GetEventMap();
-        GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr.GetActiveEventList();
+        GameEventMgr::GameEventDataMap const& events = sGameEventMgr->GetEventMap();
+        GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr->GetActiveEventList();
 
         char const* active = handler->GetTrinityString(LANG_ACTIVE);
 
@@ -90,7 +90,7 @@ public:
 
         uint32 event_id = atoi(cId);
 
-        GameEventMgr::GameEventDataMap const& events = sGameEventMgr.GetEventMap();
+        GameEventMgr::GameEventDataMap const& events = sGameEventMgr->GetEventMap();
 
         if (event_id >=events.size())
         {
@@ -107,14 +107,14 @@ public:
             return false;
         }
 
-        GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr.GetActiveEventList();
+        GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr->GetActiveEventList();
         bool active = activeEvents.find(event_id) != activeEvents.end();
         char const* activeStr = active ? handler->GetTrinityString(LANG_ACTIVE) : "";
 
         std::string startTimeStr = TimeToTimestampStr(eventData.start);
         std::string endTimeStr = TimeToTimestampStr(eventData.end);
 
-        uint32 delay = sGameEventMgr.NextCheck(event_id);
+        uint32 delay = sGameEventMgr->NextCheck(event_id);
         time_t nextTime = time(NULL)+delay;
         std::string nextStr = nextTime >= eventData.start && nextTime < eventData.end ? TimeToTimestampStr(time(NULL)+delay) : "-";
 
@@ -139,7 +139,7 @@ public:
 
         int32 event_id = atoi(cId);
 
-        GameEventMgr::GameEventDataMap const& events = sGameEventMgr.GetEventMap();
+        GameEventMgr::GameEventDataMap const& events = sGameEventMgr->GetEventMap();
 
         if (event_id < 1 || uint32(event_id) >= events.size())
         {
@@ -156,7 +156,7 @@ public:
             return false;
         }
 
-        GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr.GetActiveEventList();
+        GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr->GetActiveEventList();
         if (activeEvents.find(event_id) != activeEvents.end())
         {
             handler->PSendSysMessage(LANG_EVENT_ALREADY_ACTIVE,event_id);
@@ -164,7 +164,7 @@ public:
             return false;
         }
 
-        sGameEventMgr.StartEvent(event_id,true);
+        sGameEventMgr->StartEvent(event_id,true);
         return true;
     }
 
@@ -180,7 +180,7 @@ public:
 
         int32 event_id = atoi(cId);
 
-        GameEventMgr::GameEventDataMap const& events = sGameEventMgr.GetEventMap();
+        GameEventMgr::GameEventDataMap const& events = sGameEventMgr->GetEventMap();
 
         if (event_id < 1 || uint32(event_id) >= events.size())
         {
@@ -197,7 +197,7 @@ public:
             return false;
         }
 
-        GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr.GetActiveEventList();
+        GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr->GetActiveEventList();
 
         if (activeEvents.find(event_id) == activeEvents.end())
         {
@@ -206,7 +206,7 @@ public:
             return false;
         }
 
-        sGameEventMgr.StopEvent(event_id,true);
+        sGameEventMgr->StopEvent(event_id,true);
         return true;
     }
 };
diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp
index 7d4591fe70b..0007ad62e40 100644
--- a/src/server/scripts/Commands/cs_go.cpp
+++ b/src/server/scripts/Commands/cs_go.cpp
@@ -245,7 +245,7 @@ public:
         else
             _player->SaveRecallPosition();
 
-        Map const *map = sMapMgr.CreateBaseMap(mapid);
+        Map const *map = sMapMgr->CreateBaseMap(mapid);
         float z = std::max(map->GetHeight(x, y, MAX_HEIGHT), map->GetWaterLevel(x, y));
         _player->TeleportTo(mapid, x, y, z, _player->GetOrientation());
 
@@ -272,7 +272,7 @@ public:
         int mapid;
 
         // by DB guid
-        if (GameObjectData const* go_data = sObjectMgr.GetGOData(guid))
+        if (GameObjectData const* go_data = sObjectMgr->GetGOData(guid))
         {
             x = go_data->posX;
             y = go_data->posY;
@@ -433,7 +433,7 @@ public:
         // update to parent zone if exist (client map show only zones without parents)
         AreaTableEntry const* zoneEntry = areaEntry->zone ? GetAreaEntryByAreaID(areaEntry->zone) : areaEntry;
 
-        Map const *map = sMapMgr.CreateBaseMap(zoneEntry->mapid);
+        Map const *map = sMapMgr->CreateBaseMap(zoneEntry->mapid);
 
         if (map->Instanceable())
         {
@@ -506,7 +506,7 @@ public:
         else
             _player->SaveRecallPosition();
 
-        Map const *map = sMapMgr.CreateBaseMap(mapid);
+        Map const *map = sMapMgr->CreateBaseMap(mapid);
         float z = std::max(map->GetHeight(x, y, MAX_HEIGHT), map->GetWaterLevel(x, y));
 
         _player->TeleportTo(mapid, x, y, z, _player->GetOrientation());
@@ -573,7 +573,7 @@ public:
         if (!ticket_id)
             return false;
 
-        GM_Ticket *ticket = sTicketMgr.GetGMTicket(ticket_id);
+        GM_Ticket *ticket = sTicketMgr->GetGMTicket(ticket_id);
         if (!ticket)
         {
             handler->SendSysMessage(LANG_COMMAND_TICKETNOTEXIST);
diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp
index 866deba41e3..f36a876abdc 100644
--- a/src/server/scripts/Commands/cs_gobject.cpp
+++ b/src/server/scripts/Commands/cs_gobject.cpp
@@ -85,7 +85,7 @@ public:
         GameObject* obj = NULL;
 
         // by DB guid
-        if (GameObjectData const* go_data = sObjectMgr.GetGOData(lowguid))
+        if (GameObjectData const* go_data = sObjectMgr->GetGOData(lowguid))
             obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id);
 
         if (!obj)
@@ -147,7 +147,7 @@ public:
         Map *map = chr->GetMap();
 
         GameObject* pGameObj = new GameObject;
-        uint32 db_lowGUID = sObjectMgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT);
+        uint32 db_lowGUID = sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT);
 
         if (!pGameObj->Create(db_lowGUID, gInfo->id, map, chr->GetPhaseMaskForSpawn(), x, y, z, o, 0.0f, 0.0f, 0.0f, 0.0f, 0, GO_STATE_READY))
         {
@@ -177,7 +177,7 @@ public:
         map->Add(pGameObj);
 
         // TODO: is it really necessary to add both the real and DB table guid here ?
-        sObjectMgr.AddGameobjectToGrid(db_lowGUID, sObjectMgr.GetGOData(db_lowGUID));
+        sObjectMgr->AddGameobjectToGrid(db_lowGUID, sObjectMgr->GetGOData(db_lowGUID));
 
         handler->PSendSysMessage(LANG_GAMEOBJECT_ADD,id,gInfo->name,db_lowGUID,x,y,z);
         return true;
@@ -219,7 +219,7 @@ public:
     {
         Player* pl = handler->GetSession()->GetPlayer();
         QueryResult result;
-        GameEventMgr::ActiveEvents const& activeEventsList = sGameEventMgr.GetActiveEventList();
+        GameEventMgr::ActiveEvents const& activeEventsList = sGameEventMgr->GetActiveEventList();
         if (*args)
         {
             // number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r
@@ -293,8 +293,8 @@ public:
             o =       fields[5].GetFloat();
             mapid =   fields[6].GetUInt16();
             phase =   fields[7].GetUInt16();
-            pool_id = sPoolMgr.IsPartOfAPool<GameObject>(lowguid);
-            if (!pool_id || sPoolMgr.IsSpawnedObject<GameObject>(lowguid))
+            pool_id = sPoolMgr->IsPartOfAPool<GameObject>(lowguid);
+            if (!pool_id || sPoolMgr->IsSpawnedObject<GameObject>(lowguid))
                 found = true;
         } while (result->NextRow() && (!found));
 
@@ -345,7 +345,7 @@ public:
         GameObject* obj = NULL;
 
         // by DB guid
-        if (GameObjectData const* go_data = sObjectMgr.GetGOData(lowguid))
+        if (GameObjectData const* go_data = sObjectMgr->GetGOData(lowguid))
             obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id);
 
         if (!obj)
@@ -393,7 +393,7 @@ public:
         GameObject* obj = NULL;
 
         // by DB guid
-        if (GameObjectData const* go_data = sObjectMgr.GetGOData(lowguid))
+        if (GameObjectData const* go_data = sObjectMgr->GetGOData(lowguid))
             obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id);
 
         if (!obj)
@@ -444,7 +444,7 @@ public:
         GameObject* obj = NULL;
 
         // by DB guid
-        if (GameObjectData const* go_data = sObjectMgr.GetGOData(lowguid))
+        if (GameObjectData const* go_data = sObjectMgr->GetGOData(lowguid))
             obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id);
 
         if (!obj)
@@ -509,7 +509,7 @@ public:
         GameObject* obj = NULL;
 
         // by DB guid
-        if (GameObjectData const* go_data = sObjectMgr.GetGOData(lowguid))
+        if (GameObjectData const* go_data = sObjectMgr->GetGOData(lowguid))
             obj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id);
 
         if (!obj)
@@ -624,7 +624,7 @@ public:
 
         GameObject* gobj = NULL;
 
-        if (GameObjectData const* goData = sObjectMgr.GetGOData(lowguid))
+        if (GameObjectData const* goData = sObjectMgr->GetGOData(lowguid))
             gobj = handler->GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid, goData->id);
 
         if (!gobj)
diff --git a/src/server/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp
index 750395ff67c..eabfc4f3b2b 100644
--- a/src/server/scripts/Commands/cs_learn.cpp
+++ b/src/server/scripts/Commands/cs_learn.cpp
@@ -110,7 +110,7 @@ public:
         else
             targetPlayer->learnSpell(spell, false);
 
-        uint32 first_spell = sSpellMgr.GetFirstSpellInChain(spell);
+        uint32 first_spell = sSpellMgr->GetFirstSpellInChain(spell);
         if (GetTalentSpellCost(first_spell))
             targetPlayer->SendTalentsInfoData(false);
 
@@ -814,7 +814,7 @@ public:
                 continue;
 
             // skip spells with first rank learned as talent (and all talents then also)
-            uint32 first_rank = sSpellMgr.GetFirstSpellInChain(spellInfo->Id);
+            uint32 first_rank = sSpellMgr->GetFirstSpellInChain(spellInfo->Id);
             if (GetTalentSpellCost(first_rank) > 0)
                 continue;
 
diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp
index 32586f0c9c6..99e8d06e204 100644
--- a/src/server/scripts/Commands/cs_modify.cpp
+++ b/src/server/scripts/Commands/cs_modify.cpp
@@ -1320,7 +1320,7 @@ public:
             return false;
         }
 
-        PlayerInfo const* info = sObjectMgr.GetPlayerInfo(target->getRace(), target->getClass());
+        PlayerInfo const* info = sObjectMgr->GetPlayerInfo(target->getRace(), target->getClass());
         if (!info)
             return false;
 
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index dff80798a99..3a45f774672 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -137,7 +137,7 @@ public:
         }
 
         Creature* pCreature = new Creature;
-        if (!pCreature->Create(sObjectMgr.GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, (uint32)teamval, x, y, z, o))
+        if (!pCreature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, (uint32)teamval, x, y, z, o))
         {
             delete pCreature;
             return false;
@@ -151,7 +151,7 @@ public:
         pCreature->LoadFromDB(db_guid, map);
 
         map->Add(pCreature);
-        sObjectMgr.AddCreatureToGrid(db_guid, sObjectMgr.GetCreatureData(db_guid));
+        sObjectMgr->AddCreatureToGrid(db_guid, sObjectMgr->GetCreatureData(db_guid));
         return true;
     }
 
@@ -193,13 +193,13 @@ public:
 
         uint32 vendor_entry = vendor ? vendor->GetEntry() : 0;
 
-        if (!sObjectMgr.IsVendorItemValid(vendor_entry,itemId,maxcount,incrtime,extendedcost,handler->GetSession()->GetPlayer()))
+        if (!sObjectMgr->IsVendorItemValid(vendor_entry,itemId,maxcount,incrtime,extendedcost,handler->GetSession()->GetPlayer()))
         {
             handler->SetSentErrorMessage(true);
             return false;
         }
 
-        sObjectMgr.AddVendorItem(vendor_entry,itemId,maxcount,incrtime,extendedcost);
+        sObjectMgr->AddVendorItem(vendor_entry,itemId,maxcount,incrtime,extendedcost);
 
         ItemPrototype const* pProto = ObjectMgr::GetItemPrototype(itemId);
 
@@ -228,7 +228,7 @@ public:
         // attempt check creature existence by DB data
         if (!pCreature)
         {
-            CreatureData const* data = sObjectMgr.GetCreatureData(lowguid);
+            CreatureData const* data = sObjectMgr->GetCreatureData(lowguid);
             if (!data)
             {
                 handler->PSendSysMessage(LANG_COMMAND_CREATGUIDNOTFOUND, lowguid);
@@ -335,7 +335,7 @@ public:
         {
             if (((Pet*)pCreature)->getPetType() == HUNTER_PET)
             {
-                pCreature->SetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP, sObjectMgr.GetXPForLevel(lvl)/4);
+                pCreature->SetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP, sObjectMgr->GetXPForLevel(lvl)/4);
                 pCreature->SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, 0);
             }
             ((Pet*)pCreature)->GivePetLevel(lvl);
@@ -366,7 +366,7 @@ public:
             if (!lowguid)
                 return false;
 
-            if (CreatureData const* cr_data = sObjectMgr.GetCreatureData(lowguid))
+            if (CreatureData const* cr_data = sObjectMgr->GetCreatureData(lowguid))
                 unit = handler->GetSession()->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(lowguid, cr_data->id, HIGHGUID_UNIT));
         }
         else
@@ -412,7 +412,7 @@ public:
         }
         uint32 itemId = atol(pitem);
 
-        if (!sObjectMgr.RemoveVendorItem(vendor->GetEntry(),itemId))
+        if (!sObjectMgr->RemoveVendorItem(vendor->GetEntry(),itemId))
         {
             handler->PSendSysMessage(LANG_ITEM_NOT_IN_LIST,itemId);
             handler->SetSentErrorMessage(true);
@@ -548,7 +548,7 @@ public:
         handler->PSendSysMessage(LANG_NPCINFO_POSITION,float(target->GetPositionX()), float(target->GetPositionY()), float(target->GetPositionZ()));
         if (const CreatureData* const linked = target->GetLinkedRespawnCreatureData())
             if (CreatureInfo const *master = GetCreatureInfo(linked->id))
-                handler->PSendSysMessage(LANG_NPCINFO_LINKGUID, sObjectMgr.GetLinkedRespawnGuid(target->GetDBTableGUIDLow()), linked->id, master->Name);
+                handler->PSendSysMessage(LANG_NPCINFO_LINKGUID, sObjectMgr->GetLinkedRespawnGuid(target->GetDBTableGUIDLow()), linked->id, master->Name);
 
         if ((npcflags & UNIT_NPC_FLAG_VENDOR))
         {
@@ -586,7 +586,7 @@ public:
             // Attempting creature load from DB data
             if (!pCreature)
             {
-                CreatureData const* data = sObjectMgr.GetCreatureData(lowguid);
+                CreatureData const* data = sObjectMgr->GetCreatureData(lowguid);
                 if (!data)
                 {
                     handler->PSendSysMessage(LANG_COMMAND_CREATGUIDNOTFOUND, lowguid);
@@ -620,7 +620,7 @@ public:
 
         if (pCreature)
         {
-            if (CreatureData const* data = sObjectMgr.GetCreatureData(pCreature->GetDBTableGUIDLow()))
+            if (CreatureData const* data = sObjectMgr->GetCreatureData(pCreature->GetDBTableGUIDLow()))
             {
                 const_cast<CreatureData*>(data)->posX = x;
                 const_cast<CreatureData*>(data)->posY = y;
@@ -773,7 +773,7 @@ public:
             // attempt check creature existence by DB data
             if (!pCreature)
             {
-                CreatureData const* data = sObjectMgr.GetCreatureData(lowguid);
+                CreatureData const* data = sObjectMgr->GetCreatureData(lowguid);
                 if (!data)
                 {
                     handler->PSendSysMessage(LANG_COMMAND_CREATGUIDNOTFOUND, lowguid);
@@ -1044,7 +1044,7 @@ public:
         uint64 receiver_guid= atol(receiver_str);
 
         // check online security
-        if (handler->HasLowerSecurity(sObjectMgr.GetPlayer(receiver_guid), 0))
+        if (handler->HasLowerSecurity(sObjectMgr->GetPlayer(receiver_guid), 0))
             return false;
 
         pCreature->MonsterWhisper(text,receiver_guid);
@@ -1259,7 +1259,7 @@ public:
             return false;
         }
 
-        if (!sObjectMgr.SetCreatureLinkedRespawn(pCreature->GetDBTableGUIDLow(), linkguid))
+        if (!sObjectMgr->SetCreatureLinkedRespawn(pCreature->GetDBTableGUIDLow(), linkguid))
         {
             handler->PSendSysMessage("Selected creature can't link with guid '%u'", linkguid);
             handler->SetSentErrorMessage(true);
@@ -1377,7 +1377,7 @@ public:
         }
 
         pCreature->SetName(args);
-        uint32 idname = sObjectMgr.AddCreatureTemplate(pCreature->GetName());
+        uint32 idname = sObjectMgr->AddCreatureTemplate(pCreature->GetName());
         pCreature->SetUInt32Value(OBJECT_FIELD_ENTRY, idname);
 
         pCreature->SaveToDB();
@@ -1423,7 +1423,7 @@ public:
             return true;
         }
 
-        uint32 idname = sObjectMgr.AddCreatureSubName(pCreature->GetName(),args,pCreature->GetUInt32Value(UNIT_FIELD_DISPLAYID));
+        uint32 idname = sObjectMgr->AddCreatureSubName(pCreature->GetName(),args,pCreature->GetUInt32Value(UNIT_FIELD_DISPLAYID));
         pCreature->SetUInt32Value(OBJECT_FIELD_ENTRY, idname);
 
         pCreature->SaveToDB();
diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp
index 62984862ff9..a083b62f973 100644
--- a/src/server/scripts/Commands/cs_quest.cpp
+++ b/src/server/scripts/Commands/cs_quest.cpp
@@ -66,7 +66,7 @@ public:
 
         uint32 entry = atol(cId);
 
-        Quest const* pQuest = sObjectMgr.GetQuestTemplate(entry);
+        Quest const* pQuest = sObjectMgr->GetQuestTemplate(entry);
 
         if (!pQuest)
         {
@@ -120,7 +120,7 @@ public:
 
         uint32 entry = atol(cId);
 
-        Quest const* pQuest = sObjectMgr.GetQuestTemplate(entry);
+        Quest const* pQuest = sObjectMgr->GetQuestTemplate(entry);
 
         if (!pQuest)
         {
@@ -170,7 +170,7 @@ public:
 
         uint32 entry = atol(cId);
 
-        Quest const* pQuest = sObjectMgr.GetQuestTemplate(entry);
+        Quest const* pQuest = sObjectMgr->GetQuestTemplate(entry);
 
         // If player doesn't have the quest
         if (!pQuest || player->GetQuestStatus(entry) == QUEST_STATUS_NONE)
diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp
index aeb507cf344..676daa6a22f 100644
--- a/src/server/scripts/Commands/cs_reload.cpp
+++ b/src/server/scripts/Commands/cs_reload.cpp
@@ -166,7 +166,7 @@ public:
     //reload commands
     static bool HandleReloadGMTicketsCommand(ChatHandler* /*handler*/, const char* /*args*/)
     {
-        sTicketMgr.LoadGMTickets();
+        sTicketMgr->LoadGMTickets();
         return true;
     }
 
@@ -217,7 +217,7 @@ public:
         sLog.outString("Re-Loading Loot Tables...");
         LoadLootTables();
         handler->SendGlobalGMSysMessage("DB tables `*_loot_template` reloaded.");
-        sConditionMgr.LoadConditions(true);
+        sConditionMgr->LoadConditions(true);
         return true;
     }
 
@@ -239,7 +239,7 @@ public:
         HandleReloadQuestTemplateCommand(handler,"a");
 
         sLog.outString("Re-Loading Quests Relations...");
-        sObjectMgr.LoadQuestRelations();
+        sObjectMgr->LoadQuestRelations();
         handler->SendGlobalGMSysMessage("DB tables `*_questrelation` and `*_involvedrelation` reloaded.");
         return true;
     }
@@ -328,7 +328,7 @@ public:
     {
         sLog.outString("Re-Loading config settings...");
         sWorld.LoadConfigSettings(true);
-        sMapMgr.InitializeVisibilityDistanceInfo();
+        sMapMgr->InitializeVisibilityDistanceInfo();
         handler->SendGlobalGMSysMessage("World config settings reloaded.");
         return true;
     }
@@ -336,7 +336,7 @@ public:
     static bool HandleReloadAccessRequirementCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Access Requirement definitions...");
-        sObjectMgr.LoadAccessRequirements();
+        sObjectMgr->LoadAccessRequirements();
         handler->SendGlobalGMSysMessage("DB table `access_requirement` reloaded.");
         return true;
     }
@@ -344,7 +344,7 @@ public:
     static bool HandleReloadAchievementCriteriaDataCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Additional Achievement Criteria Data...");
-        sAchievementMgr.LoadAchievementCriteriaData();
+        sAchievementMgr->LoadAchievementCriteriaData();
         handler->SendGlobalGMSysMessage("DB table `achievement_criteria_data` reloaded.");
         return true;
     }
@@ -352,7 +352,7 @@ public:
     static bool HandleReloadAchievementRewardCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Achievement Reward Data...");
-        sAchievementMgr.LoadRewards();
+        sAchievementMgr->LoadRewards();
         handler->SendGlobalGMSysMessage("DB table `achievement_reward` reloaded.");
         return true;
     }
@@ -360,7 +360,7 @@ public:
     static bool HandleReloadAreaTriggerTavernCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Tavern Area Triggers...");
-        sObjectMgr.LoadTavernAreaTriggers();
+        sObjectMgr->LoadTavernAreaTriggers();
         handler->SendGlobalGMSysMessage("DB table `areatrigger_tavern` reloaded.");
         return true;
     }
@@ -368,7 +368,7 @@ public:
     static bool HandleReloadAreaTriggerTeleportCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading AreaTrigger teleport definitions...");
-        sObjectMgr.LoadAreaTriggerTeleports();
+        sObjectMgr->LoadAreaTriggerTeleports();
         handler->SendGlobalGMSysMessage("DB table `areatrigger_teleport` reloaded.");
         return true;
     }
@@ -391,7 +391,7 @@ public:
     static bool HandleReloadOnKillReputationCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading creature award reputation definitions...");
-        sObjectMgr.LoadReputationOnKill();
+        sObjectMgr->LoadReputationOnKill();
         handler->SendGlobalGMSysMessage("DB table `creature_onkill_reputation` reloaded.");
         return true;
     }
@@ -529,9 +529,9 @@ public:
         const_cast<CreatureInfo*>(cInfo)->equipmentId = fields[79].GetUInt32();
         const_cast<CreatureInfo*>(cInfo)->MechanicImmuneMask = fields[80].GetUInt32();
         const_cast<CreatureInfo*>(cInfo)->flags_extra = fields[81].GetUInt32();
-        const_cast<CreatureInfo*>(cInfo)->ScriptID = sObjectMgr.GetScriptId(fields[82].GetCString());
+        const_cast<CreatureInfo*>(cInfo)->ScriptID = sObjectMgr->GetScriptId(fields[82].GetCString());
 
-        sObjectMgr.CheckCreatureTemplate(cInfo);
+        sObjectMgr->CheckCreatureTemplate(cInfo);
 
         handler->SendGlobalGMSysMessage("Creature template reloaded.");
         return true;
@@ -540,7 +540,7 @@ public:
     static bool HandleReloadCreatureQuestRelationsCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Loading Quests Relations... (`creature_questrelation`)");
-        sObjectMgr.LoadCreatureQuestRelations();
+        sObjectMgr->LoadCreatureQuestRelations();
         handler->SendGlobalGMSysMessage("DB table `creature_questrelation` (creature quest givers) reloaded.");
         return true;
     }
@@ -548,7 +548,7 @@ public:
     static bool HandleReloadCreatureLinkedRespawnCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Loading Linked Respawns... (`creature_linked_respawn`)");
-        sObjectMgr.LoadCreatureLinkedRespawn();
+        sObjectMgr->LoadCreatureLinkedRespawn();
         handler->SendGlobalGMSysMessage("DB table `creature_linked_respawn` (creature linked respawns) reloaded.");
         return true;
     }
@@ -556,7 +556,7 @@ public:
     static bool HandleReloadCreatureQuestInvRelationsCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Loading Quests Relations... (`creature_involvedrelation`)");
-        sObjectMgr.LoadCreatureInvolvedRelations();
+        sObjectMgr->LoadCreatureInvolvedRelations();
         handler->SendGlobalGMSysMessage("DB table `creature_involvedrelation` (creature quest takers) reloaded.");
         return true;
     }
@@ -564,25 +564,25 @@ public:
     static bool HandleReloadGossipMenuCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading `gossip_menu` Table!");
-        sObjectMgr.LoadGossipMenu();
+        sObjectMgr->LoadGossipMenu();
         handler->SendGlobalGMSysMessage("DB table `gossip_menu` reloaded.");
-        sConditionMgr.LoadConditions(true);
+        sConditionMgr->LoadConditions(true);
         return true;
     }
 
     static bool HandleReloadGossipMenuOptionCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading `gossip_menu_option` Table!");
-        sObjectMgr.LoadGossipMenuItems();
+        sObjectMgr->LoadGossipMenuItems();
         handler->SendGlobalGMSysMessage("DB table `gossip_menu_option` reloaded.");
-        sConditionMgr.LoadConditions(true);
+        sConditionMgr->LoadConditions(true);
         return true;
     }
 
     static bool HandleReloadGOQuestRelationsCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Loading Quests Relations... (`gameobject_questrelation`)");
-        sObjectMgr.LoadGameobjectQuestRelations();
+        sObjectMgr->LoadGameobjectQuestRelations();
         handler->SendGlobalGMSysMessage("DB table `gameobject_questrelation` (gameobject quest givers) reloaded.");
         return true;
     }
@@ -590,7 +590,7 @@ public:
     static bool HandleReloadGOQuestInvRelationsCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Loading Quests Relations... (`gameobject_involvedrelation`)");
-        sObjectMgr.LoadGameobjectInvolvedRelations();
+        sObjectMgr->LoadGameobjectInvolvedRelations();
         handler->SendGlobalGMSysMessage("DB table `gameobject_involvedrelation` (gameobject quest takers) reloaded.");
         return true;
     }
@@ -598,7 +598,7 @@ public:
     static bool HandleReloadQuestAreaTriggersCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Quest Area Triggers...");
-        sObjectMgr.LoadQuestAreaTriggers();
+        sObjectMgr->LoadQuestAreaTriggers();
         handler->SendGlobalGMSysMessage("DB table `areatrigger_involvedrelation` (quest area triggers) reloaded.");
         return true;
     }
@@ -606,12 +606,12 @@ public:
     static bool HandleReloadQuestTemplateCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Quest Templates...");
-        sObjectMgr.LoadQuests();
+        sObjectMgr->LoadQuests();
         handler->SendGlobalGMSysMessage("DB table `quest_template` (quest definitions) reloaded.");
 
         /// dependent also from `gameobject` but this table not reloaded anyway
         sLog.outString("Re-Loading GameObjects for quests...");
-        sObjectMgr.LoadGameObjectForQuests();
+        sObjectMgr->LoadGameObjectForQuests();
         handler->SendGlobalGMSysMessage("Data GameObjects for quests reloaded.");
         return true;
     }
@@ -622,7 +622,7 @@ public:
         LoadLootTemplates_Creature();
         LootTemplates_Creature.CheckLootRefs();
         handler->SendGlobalGMSysMessage("DB table `creature_loot_template` reloaded.");
-        sConditionMgr.LoadConditions(true);
+        sConditionMgr->LoadConditions(true);
         return true;
     }
 
@@ -632,7 +632,7 @@ public:
         LoadLootTemplates_Disenchant();
         LootTemplates_Disenchant.CheckLootRefs();
         handler->SendGlobalGMSysMessage("DB table `disenchant_loot_template` reloaded.");
-        sConditionMgr.LoadConditions(true);
+        sConditionMgr->LoadConditions(true);
         return true;
     }
 
@@ -642,7 +642,7 @@ public:
         LoadLootTemplates_Fishing();
         LootTemplates_Fishing.CheckLootRefs();
         handler->SendGlobalGMSysMessage("DB table `fishing_loot_template` reloaded.");
-        sConditionMgr.LoadConditions(true);
+        sConditionMgr->LoadConditions(true);
         return true;
     }
 
@@ -652,7 +652,7 @@ public:
         LoadLootTemplates_Gameobject();
         LootTemplates_Gameobject.CheckLootRefs();
         handler->SendGlobalGMSysMessage("DB table `gameobject_loot_template` reloaded.");
-        sConditionMgr.LoadConditions(true);
+        sConditionMgr->LoadConditions(true);
         return true;
     }
 
@@ -662,7 +662,7 @@ public:
         LoadLootTemplates_Item();
         LootTemplates_Item.CheckLootRefs();
         handler->SendGlobalGMSysMessage("DB table `item_loot_template` reloaded.");
-        sConditionMgr.LoadConditions(true);
+        sConditionMgr->LoadConditions(true);
         return true;
     }
 
@@ -672,7 +672,7 @@ public:
         LoadLootTemplates_Milling();
         LootTemplates_Milling.CheckLootRefs();
         handler->SendGlobalGMSysMessage("DB table `milling_loot_template` reloaded.");
-        sConditionMgr.LoadConditions(true);
+        sConditionMgr->LoadConditions(true);
         return true;
     }
 
@@ -682,7 +682,7 @@ public:
         LoadLootTemplates_Pickpocketing();
         LootTemplates_Pickpocketing.CheckLootRefs();
         handler->SendGlobalGMSysMessage("DB table `pickpocketing_loot_template` reloaded.");
-        sConditionMgr.LoadConditions(true);
+        sConditionMgr->LoadConditions(true);
         return true;
     }
 
@@ -692,7 +692,7 @@ public:
         LoadLootTemplates_Prospecting();
         LootTemplates_Prospecting.CheckLootRefs();
         handler->SendGlobalGMSysMessage("DB table `prospecting_loot_template` reloaded.");
-        sConditionMgr.LoadConditions(true);
+        sConditionMgr->LoadConditions(true);
         return true;
     }
 
@@ -702,7 +702,7 @@ public:
         LoadLootTemplates_Mail();
         LootTemplates_Mail.CheckLootRefs();
         handler->SendGlobalGMSysMessage("DB table `mail_loot_template` reloaded.");
-        sConditionMgr.LoadConditions(true);
+        sConditionMgr->LoadConditions(true);
         return true;
     }
 
@@ -711,7 +711,7 @@ public:
         sLog.outString("Re-Loading Loot Tables... (`reference_loot_template`)");
         LoadLootTemplates_Reference();
         handler->SendGlobalGMSysMessage("DB table `reference_loot_template` reloaded.");
-        sConditionMgr.LoadConditions(true);
+        sConditionMgr->LoadConditions(true);
         return true;
     }
 
@@ -721,7 +721,7 @@ public:
         LoadLootTemplates_Skinning();
         LootTemplates_Skinning.CheckLootRefs();
         handler->SendGlobalGMSysMessage("DB table `skinning_loot_template` reloaded.");
-        sConditionMgr.LoadConditions(true);
+        sConditionMgr->LoadConditions(true);
         return true;
     }
 
@@ -731,14 +731,14 @@ public:
         LoadLootTemplates_Spell();
         LootTemplates_Spell.CheckLootRefs();
         handler->SendGlobalGMSysMessage("DB table `spell_loot_template` reloaded.");
-        sConditionMgr.LoadConditions(true);
+        sConditionMgr->LoadConditions(true);
         return true;
     }
 
     static bool HandleReloadTrinityStringCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading trinity_string Table!");
-        sObjectMgr.LoadTrinityStrings();
+        sObjectMgr->LoadTrinityStrings();
         handler->SendGlobalGMSysMessage("DB table `trinity_string` reloaded.");
         return true;
     }
@@ -746,7 +746,7 @@ public:
     static bool HandleReloadNpcGossipCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading `npc_gossip` Table!");
-        sObjectMgr.LoadNpcTextId();
+        sObjectMgr->LoadNpcTextId();
         handler->SendGlobalGMSysMessage("DB table `npc_gossip` reloaded.");
         return true;
     }
@@ -754,7 +754,7 @@ public:
     static bool HandleReloadNpcTrainerCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading `npc_trainer` Table!");
-        sObjectMgr.LoadTrainerSpell();
+        sObjectMgr->LoadTrainerSpell();
         handler->SendGlobalGMSysMessage("DB table `npc_trainer` reloaded.");
         return true;
     }
@@ -762,7 +762,7 @@ public:
     static bool HandleReloadNpcVendorCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading `npc_vendor` Table!");
-        sObjectMgr.LoadVendors();
+        sObjectMgr->LoadVendors();
         handler->SendGlobalGMSysMessage("DB table `npc_vendor` reloaded.");
         return true;
     }
@@ -770,7 +770,7 @@ public:
     static bool HandleReloadPointsOfInterestCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading `points_of_interest` Table!");
-        sObjectMgr.LoadPointsOfInterest();
+        sObjectMgr->LoadPointsOfInterest();
         handler->SendGlobalGMSysMessage("DB table `points_of_interest` reloaded.");
         return true;
     }
@@ -778,7 +778,7 @@ public:
     static bool HandleReloadQuestPOICommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString( "Re-Loading Quest POI ..." );
-        sObjectMgr.LoadQuestPOI();
+        sObjectMgr->LoadQuestPOI();
         handler->SendGlobalGMSysMessage("DB Table `quest_poi` and `quest_poi_points` reloaded.");
         return true;
     }
@@ -786,7 +786,7 @@ public:
     static bool HandleReloadSpellClickSpellsCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading `npc_spellclick_spells` Table!");
-        sObjectMgr.LoadNPCSpellClickSpells();
+        sObjectMgr->LoadNPCSpellClickSpells();
         handler->SendGlobalGMSysMessage("DB table `npc_spellclick_spells` reloaded.");
         return true;
     }
@@ -794,7 +794,7 @@ public:
     static bool HandleReloadReservedNameCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Loading ReservedNames... (`reserved_name`)");
-        sObjectMgr.LoadReservedPlayersNames();
+        sObjectMgr->LoadReservedPlayersNames();
         handler->SendGlobalGMSysMessage("DB table `reserved_name` (player reserved names) reloaded.");
         return true;
     }
@@ -802,7 +802,7 @@ public:
     static bool HandleReloadReputationRewardRateCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString( "Re-Loading `reputation_reward_rate` Table!" );
-        sObjectMgr.LoadReputationRewardRate();
+        sObjectMgr->LoadReputationRewardRate();
         handler->SendGlobalSysMessage("DB table `reputation_reward_rate` reloaded.");
         return true;
     }
@@ -810,7 +810,7 @@ public:
     static bool HandleReloadReputationSpilloverTemplateCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString( "Re-Loading `reputation_spillover_template` Table!" );
-        sObjectMgr.LoadReputationSpilloverTemplate();
+        sObjectMgr->LoadReputationSpilloverTemplate();
         handler->SendGlobalSysMessage("DB table `reputation_spillover_template` reloaded.");
         return true;
     }
@@ -834,7 +834,7 @@ public:
     static bool HandleReloadSkillFishingBaseLevelCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Skill Fishing base level requirements...");
-        sObjectMgr.LoadFishingBaseSkillLevel();
+        sObjectMgr->LoadFishingBaseSkillLevel();
         handler->SendGlobalGMSysMessage("DB table `skill_fishing_base_level` (fishing base level for zone/subzone) reloaded.");
         return true;
     }
@@ -842,7 +842,7 @@ public:
     static bool HandleReloadSpellAreaCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading SpellArea Data...");
-        sSpellMgr.LoadSpellAreas();
+        sSpellMgr->LoadSpellAreas();
         handler->SendGlobalGMSysMessage("DB table `spell_area` (spell dependences from area/quest/auras state) reloaded.");
         return true;
     }
@@ -850,7 +850,7 @@ public:
     static bool HandleReloadSpellRequiredCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Spell Required Data... ");
-        sSpellMgr.LoadSpellRequired();
+        sSpellMgr->LoadSpellRequired();
         handler->SendGlobalGMSysMessage("DB table `spell_required` reloaded.");
         return true;
     }
@@ -858,7 +858,7 @@ public:
     static bool HandleReloadSpellGroupsCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Spell Groups...");
-        sSpellMgr.LoadSpellGroups();
+        sSpellMgr->LoadSpellGroups();
         handler->SendGlobalGMSysMessage("DB table `spell_group` (spell groups) reloaded.");
         return true;
     }
@@ -866,7 +866,7 @@ public:
     static bool HandleReloadSpellLearnSpellCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Spell Learn Spells...");
-        sSpellMgr.LoadSpellLearnSpells();
+        sSpellMgr->LoadSpellLearnSpells();
         handler->SendGlobalGMSysMessage("DB table `spell_learn_spell` reloaded.");
         return true;
     }
@@ -874,7 +874,7 @@ public:
     static bool HandleReloadSpellLinkedSpellCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Spell Linked Spells...");
-        sSpellMgr.LoadSpellLinked();
+        sSpellMgr->LoadSpellLinked();
         handler->SendGlobalGMSysMessage("DB table `spell_linked_spell` reloaded.");
         return true;
     }
@@ -882,7 +882,7 @@ public:
     static bool HandleReloadSpellProcEventCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Spell Proc Event conditions...");
-        sSpellMgr.LoadSpellProcEvents();
+        sSpellMgr->LoadSpellProcEvents();
         handler->SendGlobalGMSysMessage("DB table `spell_proc_event` (spell proc trigger requirements) reloaded.");
         return true;
     }
@@ -890,7 +890,7 @@ public:
     static bool HandleReloadSpellBonusesCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Spell Bonus Data...");
-        sSpellMgr.LoadSpellBonusess();
+        sSpellMgr->LoadSpellBonusess();
         handler->SendGlobalGMSysMessage("DB table `spell_bonus_data` (spell damage/healing coefficients) reloaded.");
         return true;
     }
@@ -898,7 +898,7 @@ public:
     static bool HandleReloadSpellTargetPositionCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Spell target coordinates...");
-        sSpellMgr.LoadSpellTargetPositions();
+        sSpellMgr->LoadSpellTargetPositions();
         handler->SendGlobalGMSysMessage("DB table `spell_target_position` (destination coordinates for spell targets) reloaded.");
         return true;
     }
@@ -906,7 +906,7 @@ public:
     static bool HandleReloadSpellThreatsCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Aggro Spells Definitions...");
-        sSpellMgr.LoadSpellThreats();
+        sSpellMgr->LoadSpellThreats();
         handler->SendGlobalGMSysMessage("DB table `spell_threat` (spell aggro definitions) reloaded.");
         return true;
     }
@@ -914,7 +914,7 @@ public:
     static bool HandleReloadSpellGroupStackRulesCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Spell Group Stack Rules...");
-        sSpellMgr.LoadSpellGroupStackRules();
+        sSpellMgr->LoadSpellGroupStackRules();
         handler->SendGlobalGMSysMessage("DB table `spell_group_stack_rules` (spell stacking definitions) reloaded.");
         return true;
     }
@@ -922,7 +922,7 @@ public:
     static bool HandleReloadSpellPetAurasCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Spell pet auras...");
-        sSpellMgr.LoadSpellPetAuras();
+        sSpellMgr->LoadSpellPetAuras();
         handler->SendGlobalGMSysMessage("DB table `spell_pet_auras` reloaded.");
         return true;
     }
@@ -930,7 +930,7 @@ public:
     static bool HandleReloadPageTextsCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Page Texts...");
-        sObjectMgr.LoadPageTexts();
+        sObjectMgr->LoadPageTexts();
         handler->SendGlobalGMSysMessage("DB table `page_texts` reloaded.");
         return true;
     }
@@ -963,7 +963,7 @@ public:
         if (*args != 'a')
             sLog.outString("Re-Loading Scripts from `gossip_scripts`...");
 
-        sObjectMgr.LoadGossipScripts();
+        sObjectMgr->LoadGossipScripts();
 
         if (*args != 'a')
             handler->SendGlobalGMSysMessage("DB table `gossip_scripts` reloaded.");
@@ -983,7 +983,7 @@ public:
         if (*args != 'a')
             sLog.outString("Re-Loading Scripts from `gameobject_scripts`...");
 
-        sObjectMgr.LoadGameObjectScripts();
+        sObjectMgr->LoadGameObjectScripts();
 
         if (*args != 'a')
             handler->SendGlobalGMSysMessage("DB table `gameobject_scripts` reloaded.");
@@ -1003,7 +1003,7 @@ public:
         if (*args != 'a')
             sLog.outString("Re-Loading Scripts from `event_scripts`...");
 
-        sObjectMgr.LoadEventScripts();
+        sObjectMgr->LoadEventScripts();
 
         if (*args != 'a')
             handler->SendGlobalGMSysMessage("DB table `event_scripts` reloaded.");
@@ -1023,7 +1023,7 @@ public:
         if (*args != 'a')
             sLog.outString("Re-Loading Scripts from `waypoint_scripts`...");
 
-        sObjectMgr.LoadWaypointScripts();
+        sObjectMgr->LoadWaypointScripts();
 
         if (*args != 'a')
             handler->SendGlobalGMSysMessage("DB table `waypoint_scripts` reloaded.");
@@ -1035,7 +1035,7 @@ public:
     {
 
         sLog.outString("Re-Loading Texts from `creature_ai_texts`...");
-        sEventAIMgr.LoadCreatureEventAI_Texts();
+        sEventAIMgr->LoadCreatureEventAI_Texts();
         handler->SendGlobalGMSysMessage("DB table `creature_ai_texts` reloaded.");
         return true;
     }
@@ -1043,7 +1043,7 @@ public:
     static bool HandleReloadEventAISummonsCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Summons from `creature_ai_summons`...");
-        sEventAIMgr.LoadCreatureEventAI_Summons();
+        sEventAIMgr->LoadCreatureEventAI_Summons();
         handler->SendGlobalGMSysMessage("DB table `creature_ai_summons` reloaded.");
         return true;
     }
@@ -1051,7 +1051,7 @@ public:
     static bool HandleReloadEventAIScriptsCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Scripts from `creature_ai_scripts`...");
-        sEventAIMgr.LoadCreatureEventAI_Scripts();
+        sEventAIMgr->LoadCreatureEventAI_Scripts();
         handler->SendGlobalGMSysMessage("DB table `creature_ai_scripts` reloaded.");
         return true;
     }
@@ -1068,7 +1068,7 @@ public:
         if (*args != 'a')
             sLog.outString("Re-Loading Scripts from `quest_end_scripts`...");
 
-        sObjectMgr.LoadQuestEndScripts();
+        sObjectMgr->LoadQuestEndScripts();
 
         if (*args != 'a')
             handler->SendGlobalGMSysMessage("DB table `quest_end_scripts` reloaded.");
@@ -1088,7 +1088,7 @@ public:
         if (*args != 'a')
             sLog.outString("Re-Loading Scripts from `quest_start_scripts`...");
 
-        sObjectMgr.LoadQuestStartScripts();
+        sObjectMgr->LoadQuestStartScripts();
 
         if (*args != 'a')
             handler->SendGlobalGMSysMessage("DB table `quest_start_scripts` reloaded.");
@@ -1108,7 +1108,7 @@ public:
         if (*args != 'a')
             sLog.outString("Re-Loading Scripts from `spell_scripts`...");
 
-        sObjectMgr.LoadSpellScripts();
+        sObjectMgr->LoadSpellScripts();
 
         if (*args != 'a')
             handler->SendGlobalGMSysMessage("DB table `spell_scripts` reloaded.");
@@ -1119,7 +1119,7 @@ public:
     static bool HandleReloadDbScriptStringCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Script strings from `db_script_string`...");
-        sObjectMgr.LoadDbScriptStrings();
+        sObjectMgr->LoadDbScriptStrings();
         handler->SendGlobalGMSysMessage("DB table `db_script_string` reloaded.");
         return true;
     }
@@ -1128,7 +1128,7 @@ public:
     {
         sLog.outString("Re-Loading Graveyard-zone links...");
 
-        sObjectMgr.LoadGraveyardZones();
+        sObjectMgr->LoadGraveyardZones();
 
         handler->SendGlobalGMSysMessage("DB table `game_graveyard_zone` reloaded.");
 
@@ -1139,7 +1139,7 @@ public:
     {
         sLog.outString("Re-Loading Game Tele coordinates...");
 
-        sObjectMgr.LoadGameTele();
+        sObjectMgr->LoadGameTele();
 
         handler->SendGlobalGMSysMessage("DB table `game_tele` reloaded.");
 
@@ -1149,9 +1149,9 @@ public:
     static bool HandleReloadDisablesCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading disables table...");
-        sDisableMgr.LoadDisables();
+        sDisableMgr->LoadDisables();
         sLog.outString("Checking quest disables...");
-        sDisableMgr.CheckQuestDisables();
+        sDisableMgr->CheckQuestDisables();
         handler->SendGlobalGMSysMessage("DB table `disables` reloaded.");
         return true;
     }
@@ -1159,7 +1159,7 @@ public:
     static bool HandleReloadLocalesAchievementRewardCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Locales Achievement Reward Data...");
-        sAchievementMgr.LoadRewardLocales();
+        sAchievementMgr->LoadRewardLocales();
         handler->SendGlobalGMSysMessage("DB table `locales_achievement_reward` reloaded.");
         return true;
     }
@@ -1167,7 +1167,7 @@ public:
     static bool HandleReloadLfgEncountersCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading dungeon encounter lfg associations...");
-        sLFGMgr.LoadDungeonEncounters();
+        sLFGMgr->LoadDungeonEncounters();
         handler->SendGlobalGMSysMessage("DB table `lfg_dungeon_encounters` reloaded.");
         return true;
     }
@@ -1175,7 +1175,7 @@ public:
     static bool HandleReloadLfgRewardsCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading lfg dungeon rewards...");
-        sLFGMgr.LoadRewards();
+        sLFGMgr->LoadRewards();
         handler->SendGlobalGMSysMessage("DB table `lfg_dungeon_rewards` reloaded.");
         return true;
     }
@@ -1183,7 +1183,7 @@ public:
     static bool HandleReloadLocalesCreatureCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Locales Creature ...");
-        sObjectMgr.LoadCreatureLocales();
+        sObjectMgr->LoadCreatureLocales();
         handler->SendGlobalGMSysMessage("DB table `locales_creature` reloaded.");
         return true;
     }
@@ -1191,7 +1191,7 @@ public:
     static bool HandleReloadLocalesGameobjectCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Locales Gameobject ... ");
-        sObjectMgr.LoadGameObjectLocales();
+        sObjectMgr->LoadGameObjectLocales();
         handler->SendGlobalGMSysMessage("DB table `locales_gameobject` reloaded.");
         return true;
     }
@@ -1199,7 +1199,7 @@ public:
     static bool HandleReloadLocalesGossipMenuOptionCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString( "Re-Loading Locales Gossip Menu Option ... ");
-        sObjectMgr.LoadGossipMenuItemsLocales();
+        sObjectMgr->LoadGossipMenuItemsLocales();
         handler->SendGlobalGMSysMessage("DB table `locales_gossip_menu_option` reloaded.");
         return true;
     }
@@ -1207,7 +1207,7 @@ public:
     static bool HandleReloadLocalesItemCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Locales Item ... ");
-        sObjectMgr.LoadItemLocales();
+        sObjectMgr->LoadItemLocales();
         handler->SendGlobalGMSysMessage("DB table `locales_item` reloaded.");
         return true;
     }
@@ -1215,7 +1215,7 @@ public:
     static bool HandleReloadLocalesItemSetNameCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Locales Item set name... ");
-        sObjectMgr.LoadItemSetNameLocales();
+        sObjectMgr->LoadItemSetNameLocales();
         handler->SendGlobalGMSysMessage("DB table `locales_item_set_name` reloaded.");
         return true;
     }
@@ -1223,7 +1223,7 @@ public:
     static bool HandleReloadLocalesNpcTextCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Locales NPC Text ... ");
-        sObjectMgr.LoadNpcTextLocales();
+        sObjectMgr->LoadNpcTextLocales();
         handler->SendGlobalGMSysMessage("DB table `locales_npc_text` reloaded.");
         return true;
     }
@@ -1231,7 +1231,7 @@ public:
     static bool HandleReloadLocalesPageTextCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Locales Page Text ... ");
-        sObjectMgr.LoadPageTextLocales();
+        sObjectMgr->LoadPageTextLocales();
         handler->SendGlobalGMSysMessage("DB table `locales_page_text` reloaded.");
         return true;
     }
@@ -1239,7 +1239,7 @@ public:
     static bool HandleReloadLocalesPointsOfInterestCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Locales Points Of Interest ... ");
-        sObjectMgr.LoadPointOfInterestLocales();
+        sObjectMgr->LoadPointOfInterestLocales();
         handler->SendGlobalGMSysMessage("DB table `locales_points_of_interest` reloaded.");
         return true;
     }
@@ -1247,7 +1247,7 @@ public:
     static bool HandleReloadLocalesQuestCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Locales Quest ... ");
-        sObjectMgr.LoadQuestLocales();
+        sObjectMgr->LoadQuestLocales();
         handler->SendGlobalGMSysMessage("DB table `locales_quest` reloaded.");
         return true;
     }
@@ -1255,7 +1255,7 @@ public:
     static bool HandleReloadMailLevelRewardCommand(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Player level dependent mail rewards...");
-        sObjectMgr.LoadMailLevelRewards();
+        sObjectMgr->LoadMailLevelRewards();
         handler->SendGlobalGMSysMessage("DB table `mail_level_reward` reloaded.");
         return true;
     }
@@ -1264,8 +1264,8 @@ public:
     {
         ///- Reload dynamic data tables from the database
         sLog.outString("Re-Loading Auctions...");
-        sAuctionMgr.LoadAuctionItems();
-        sAuctionMgr.LoadAuctions();
+        sAuctionMgr->LoadAuctionItems();
+        sAuctionMgr->LoadAuctions();
         handler->SendGlobalGMSysMessage("Auctions reloaded.");
         return true;
     }
@@ -1273,7 +1273,7 @@ public:
     static bool HandleReloadConditions(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Conditions...");
-        sConditionMgr.LoadConditions(true);
+        sConditionMgr->LoadConditions(true);
         handler->SendGlobalGMSysMessage("Conditions reloaded.");
         return true;
     }
@@ -1281,7 +1281,7 @@ public:
     static bool HandleReloadCreatureText(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Creature Texts...");
-        sCreatureTextMgr.LoadCreatureTexts();
+        sCreatureTextMgr->LoadCreatureTexts();
         handler->SendGlobalGMSysMessage("Creature Texts reloaded.");
         return true;
     }
@@ -1289,7 +1289,7 @@ public:
     static bool HandleReloadSmartScripts(ChatHandler* handler, const char* /*args*/)
     {
         sLog.outString("Re-Loading Smart Scripts...");
-        sSmartScriptMgr.LoadSmartAIFromDB();
+        sSmartScriptMgr->LoadSmartAIFromDB();
         handler->SendGlobalGMSysMessage("Smart Scripts reloaded.");
         return true;
     }
diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp
index cada62a684c..f17ddec56cd 100644
--- a/src/server/scripts/Commands/cs_tele.cpp
+++ b/src/server/scripts/Commands/cs_tele.cpp
@@ -63,7 +63,7 @@ public:
 
         std::string name = args;
 
-        if (sObjectMgr.GetGameTele(name))
+        if (sObjectMgr->GetGameTele(name))
         {
             handler->SendSysMessage(LANG_COMMAND_TP_ALREADYEXIST);
             handler->SetSentErrorMessage(true);
@@ -78,7 +78,7 @@ public:
         tele.mapId       = player->GetMapId();
         tele.name        = name;
 
-        if (sObjectMgr.AddGameTele(tele))
+        if (sObjectMgr->AddGameTele(tele))
         {
             handler->SendSysMessage(LANG_COMMAND_TP_ADDED);
         }
@@ -99,7 +99,7 @@ public:
 
         std::string name = args;
 
-        if (!sObjectMgr.DeleteGameTele(name))
+        if (!sObjectMgr->DeleteGameTele(name))
         {
             handler->SendSysMessage(LANG_COMMAND_TELE_NOTFOUND);
             handler->SetSentErrorMessage(true);
@@ -175,7 +175,7 @@ public:
 
             handler->PSendSysMessage(LANG_TELEPORTING_TO, nameLink.c_str(), handler->GetTrinityString(LANG_OFFLINE), tele->name.c_str());
             Player::SavePositionInDB(tele->mapId,tele->position_x,tele->position_y,tele->position_z,tele->orientation,
-                sMapMgr.GetZoneId(tele->mapId,tele->position_x,tele->position_y,tele->position_z),target_guid);
+                sMapMgr->GetZoneId(tele->mapId,tele->position_x,tele->position_y,tele->position_z),target_guid);
         }
 
         return true;
diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp
index ed09879e1b1..17e2ef27907 100644
--- a/src/server/scripts/Commands/cs_wp.cpp
+++ b/src/server/scripts/Commands/cs_wp.cpp
@@ -599,7 +599,7 @@ public:
                     wpCreature->AddObjectToRemoveList();
                     // re-create
                     Creature* wpCreature2 = new Creature;
-                    if (!wpCreature2->Create(sObjectMgr.GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), VISUAL_WAYPOINT, 0, 0, chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ(), chr->GetOrientation()))
+                    if (!wpCreature2->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), VISUAL_WAYPOINT, 0, 0, chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ(), chr->GetOrientation()))
                     {
                         handler->PSendSysMessage(LANG_WAYPOINT_VP_NOTCREATED, VISUAL_WAYPOINT);
                         delete wpCreature2;
@@ -610,7 +610,7 @@ public:
                     // To call _LoadGoods(); _LoadQuests(); CreateTrainerSpells();
                     wpCreature2->LoadFromDB(wpCreature2->GetDBTableGUIDLow(), map);
                     map->Add(wpCreature2);
-                    //sMapMgr.GetMap(npcCreature->GetMapId())->Add(wpCreature2);
+                    //sMapMgr->GetMap(npcCreature->GetMapId())->Add(wpCreature2);
                 }
 
                 WorldDatabase.PExecute("UPDATE waypoint_data SET position_x = '%f',position_y = '%f',position_z = '%f' where id = '%u' AND point='%u'",
@@ -804,7 +804,7 @@ public:
                 float o = chr->GetOrientation();
 
                 Creature* wpCreature = new Creature;
-                if (!wpCreature->Create(sObjectMgr.GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o))
+                if (!wpCreature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o))
                 {
                     handler->PSendSysMessage(LANG_WAYPOINT_VP_NOTCREATED, id);
                     delete wpCreature;
@@ -856,7 +856,7 @@ public:
             Map *map = chr->GetMap();
 
             Creature* pCreature = new Creature;
-            if (!pCreature->Create(sObjectMgr.GenerateLowGuid(HIGHGUID_UNIT),map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o))
+            if (!pCreature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT),map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o))
             {
                 handler->PSendSysMessage(LANG_WAYPOINT_VP_NOTCREATED, id);
                 delete pCreature;
@@ -904,7 +904,7 @@ public:
             Map *map = chr->GetMap();
 
             Creature* pCreature = new Creature;
-            if (!pCreature->Create(sObjectMgr.GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o))
+            if (!pCreature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o))
             {
                 handler->PSendSysMessage(LANG_WAYPOINT_NOTCREATED, id);
                 delete pCreature;
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
index 54e7a8d75df..ea226e84682 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
@@ -230,9 +230,9 @@ public:
 
             //Trinity::Singleton<MapManager>::Instance().GetMap(me->GetMapId(), me)->GetPlayers().begin();
             /*
-            list <Player*>::const_iterator i = sMapMgr.GetMap(me->GetMapId(), me)->GetPlayers().begin();
+            list <Player*>::const_iterator i = sMapMgr->GetMap(me->GetMapId(), me)->GetPlayers().begin();
 
-            for (i = sMapMgr.GetMap(me->GetMapId(), me)->GetPlayers().begin(); i != sMapMgr.GetMap(me->GetMapId(), me)->GetPlayers().end(); ++i)
+            for (i = sMapMgr->GetMap(me->GetMapId(), me)->GetPlayers().begin(); i != sMapMgr->GetMap(me->GetMapId(), me)->GetPlayers().end(); ++i)
             {
             AttackStart((*i));
             }
@@ -329,7 +329,7 @@ public:
                     if (SpawnedAdds >= 42)
                     {
                         //Teleport Victor Nefarius way out of the map
-                        //sMapMgr.GetMap(me->GetMapId(), me)->CreatureRelocation(me,0,0,-5000,0);
+                        //sMapMgr->GetMap(me->GetMapId(), me)->CreatureRelocation(me,0,0,-5000,0);
 
                         //Interrupt any spell casting
                         me->InterruptNonMeleeSpells(false);
diff --git a/src/server/scripts/Examples/example_misc.cpp b/src/server/scripts/Examples/example_misc.cpp
index 98a7323e1dd..ee91568d0c5 100644
--- a/src/server/scripts/Examples/example_misc.cpp
+++ b/src/server/scripts/Examples/example_misc.cpp
@@ -58,7 +58,7 @@ class ItemUse_example_item : public ItemScript
 
         bool OnUse(Player* /*player*/, Item* /*item*/, SpellCastTargets const& /*targets*/)
         {
-            sScriptMgr.LoadDatabase();
+            sScriptMgr->LoadDatabase();
             return true;
         }
 };
diff --git a/src/server/scripts/Kalimdor/azshara.cpp b/src/server/scripts/Kalimdor/azshara.cpp
index 8b9eef64f93..c45b29a8ae3 100644
--- a/src/server/scripts/Kalimdor/azshara.cpp
+++ b/src/server/scripts/Kalimdor/azshara.cpp
@@ -418,7 +418,7 @@ public:
         void SendText(int32 iTextEntry, Player* pPlayer)
         {
             LocaleConstant loc_idx = pPlayer->GetSession()->GetSessionDbLocaleIndex();
-            const char* text = sObjectMgr.GetTrinityString(iTextEntry, loc_idx);
+            const char* text = sObjectMgr->GetTrinityString(iTextEntry, loc_idx);
             sWorld.SendServerMessage(SERVER_MSG_STRING, text, pPlayer);
         }
 
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
index cc2267a7505..7e679f0a0ca 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
@@ -357,7 +357,7 @@ class boss_prince_keleseth_icc : public CreatureScript
 
             void InitializeAI()
             {
-                if (CreatureData const* data = sObjectMgr.GetCreatureData(me->GetDBTableGUIDLow()))
+                if (CreatureData const* data = sObjectMgr->GetCreatureData(me->GetDBTableGUIDLow()))
                     if (data->curhealth)
                         spawnHealth = data->curhealth;
 
@@ -542,7 +542,7 @@ class boss_prince_taldaram_icc : public CreatureScript
 
             void InitializeAI()
             {
-                if (CreatureData const* data = sObjectMgr.GetCreatureData(me->GetDBTableGUIDLow()))
+                if (CreatureData const* data = sObjectMgr->GetCreatureData(me->GetDBTableGUIDLow()))
                     if (data->curhealth)
                         spawnHealth = data->curhealth;
 
@@ -741,7 +741,7 @@ class boss_prince_valanar_icc : public CreatureScript
 
             void InitializeAI()
             {
-                if (CreatureData const* data = sObjectMgr.GetCreatureData(me->GetDBTableGUIDLow()))
+                if (CreatureData const* data = sObjectMgr->GetCreatureData(me->GetDBTableGUIDLow()))
                     if (data->curhealth)
                         spawnHealth = data->curhealth;
 
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
index 7632752f5a4..6c032d58bc2 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
@@ -433,7 +433,7 @@ class spell_blood_queen_vampiric_bite : public SpellScriptLoader
                 }
 
                 SpellEntry const* spell = sSpellStore.LookupEntry(SPELL_FRENZIED_BLOODTHIRST);
-                spell = sSpellMgr.GetSpellForDifficultyFromSpell(spell, GetCaster());
+                spell = sSpellMgr->GetSpellForDifficultyFromSpell(spell, GetCaster());
                 GetCaster()->RemoveAura(spell->Id, 0, 0, AURA_REMOVE_BY_ENEMY_SPELL);
                 GetCaster()->CastSpell(GetCaster(), SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_PLR, true);
                 // Presence of the Darkfallen buff on Blood-Queen
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
index 086bd0547bf..a8fc9405285 100755
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
@@ -365,7 +365,7 @@ class spell_festergut_pungent_blight : public SpellScriptLoader
                     return;
 
                 // Get Inhaled Blight id for our difficulty
-                spellInfo = sSpellMgr.GetSpellForDifficultyFromSpell(spellInfo, GetCaster());
+                spellInfo = sSpellMgr->GetSpellForDifficultyFromSpell(spellInfo, GetCaster());
 
                 // ...and remove it
                 GetCaster()->RemoveAurasDueToSpell(spellInfo->Id);
@@ -404,7 +404,7 @@ class spell_festergut_gastric_bloat : public SpellScriptLoader
                     return;
 
                 // Get Gastric Explosion id for our difficulty
-                spellInfo = sSpellMgr.GetSpellForDifficultyFromSpell(spellInfo, GetCaster());
+                spellInfo = sSpellMgr->GetSpellForDifficultyFromSpell(spellInfo, GetCaster());
                 GetHitUnit()->RemoveAurasDueToSpell(GetSpellInfo()->Id);
                 GetHitUnit()->CastSpell(GetHitUnit(), spellInfo, true);
             }
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
index f88274ca956..28d6a58b935 100755
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
@@ -348,7 +348,7 @@ class boss_professor_putricide : public CreatureScript
                             case PHASE_COMBAT_2:
                             {
                                 SpellEntry const* spell = sSpellStore.LookupEntry(SPELL_CREATE_CONCOCTION);
-                                spell = sSpellMgr.GetSpellForDifficultyFromSpell(spell, me);
+                                spell = sSpellMgr->GetSpellForDifficultyFromSpell(spell, me);
                                 DoCast(me, SPELL_CREATE_CONCOCTION);
                                 events.ScheduleEvent(EVENT_PHASE_TRANSITION, GetSpellCastTime(spell)+100);
                                 break;
@@ -356,7 +356,7 @@ class boss_professor_putricide : public CreatureScript
                             case PHASE_COMBAT_3:
                             {
                                 SpellEntry const* spell = sSpellStore.LookupEntry(SPELL_GUZZLE_POTIONS);
-                                spell = sSpellMgr.GetSpellForDifficultyFromSpell(spell, me);
+                                spell = sSpellMgr->GetSpellForDifficultyFromSpell(spell, me);
                                 DoCast(me, SPELL_GUZZLE_POTIONS);
                                 events.ScheduleEvent(EVENT_PHASE_TRANSITION, GetSpellCastTime(spell)+100);
                                 break;
@@ -686,7 +686,7 @@ class npc_volatile_ooze : public CreatureScript
             void SpellHitTarget(Unit* /*target*/, SpellEntry const* spell)
             {
                 SpellEntry const* explode = sSpellStore.LookupEntry(SPELL_OOZE_ERUPTION);
-                explode = sSpellMgr.GetSpellForDifficultyFromSpell(explode, me);
+                explode = sSpellMgr->GetSpellForDifficultyFromSpell(explode, me);
                 if (explode->Id == spell->Id)
                 {
                     newTargetSelectTimer = 5000;
@@ -955,7 +955,7 @@ class spell_putricide_ooze_eruption_searcher : public SpellScriptLoader
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
                 SpellEntry const* adhesive = sSpellStore.LookupEntry(SPELL_VOLATILE_OOZE_ADHESIVE);
-                adhesive = sSpellMgr.GetSpellForDifficultyFromSpell(adhesive, GetCaster());
+                adhesive = sSpellMgr->GetSpellForDifficultyFromSpell(adhesive, GetCaster());
                 if (GetHitUnit()->HasAura(adhesive->Id))
                 {
                     GetCaster()->CastSpell(GetHitUnit(), SPELL_OOZE_ERUPTION, true);
@@ -1031,8 +1031,8 @@ class spell_putricide_unbound_plague : public SpellScriptLoader
                     professor = Unit::GetCreature(*GetCaster(), instance->GetData64(DATA_PROFESSOR_PUTRICIDE));
                     if (professor)
                     {
-                        plague = sSpellMgr.GetSpellForDifficultyFromSpell(plague, professor);
-                        searcher = sSpellMgr.GetSpellForDifficultyFromSpell(searcher, professor);
+                        plague = sSpellMgr->GetSpellForDifficultyFromSpell(plague, professor);
+                        searcher = sSpellMgr->GetSpellForDifficultyFromSpell(searcher, professor);
                     }
                 }
 
@@ -1125,7 +1125,7 @@ class spell_putricide_mutated_plague : public SpellScriptLoader
 
                 uint32 triggerSpell = GetSpellProto()->EffectTriggerSpell[aurEff->GetEffIndex()];
                 SpellEntry const* spell = sSpellStore.LookupEntry(triggerSpell);
-                spell = sSpellMgr.GetSpellForDifficultyFromSpell(spell, caster);
+                spell = sSpellMgr->GetSpellForDifficultyFromSpell(spell, caster);
 
                 int32 damage = SpellMgr::CalculateSpellEffectAmount(spell, 0, caster);
                 float multiplier = 2.0f;
diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp
index 1957f718969..38f5b85387f 100644
--- a/src/server/scripts/Northrend/borean_tundra.cpp
+++ b/src/server/scripts/Northrend/borean_tundra.cpp
@@ -2130,7 +2130,7 @@ public:
                 (me->HasAura(SPELL_AURA_NOTSOBIG_1) || me->HasAura(SPELL_AURA_NOTSOBIG_2) ||
                 me->HasAura(SPELL_AURA_NOTSOBIG_3) || me->HasAura(SPELL_AURA_NOTSOBIG_4)))
             {
-                Quest const* qInfo = sObjectMgr.GetQuestTemplate(QUEST_YOU_RE_NOT_SO_BIG_NOW);
+                Quest const* qInfo = sObjectMgr->GetQuestTemplate(QUEST_YOU_RE_NOT_SO_BIG_NOW);
                 if (qInfo)
                     CAST_PLR(pKiller)->KilledMonsterCredit(qInfo->ReqCreatureOrGOId[0],0);
             }
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
index 962eca6506e..1975bb9233b 100755
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
@@ -40,12 +40,12 @@ void OPvPCapturePointEP_EWT::ChangeState()
     // if changing from controlling alliance to horde or vice versa
     if ( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State )
     {
-        sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_A));
+        sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_A));
         ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_EWT] = 0;
     }
     else if ( m_OldState == OBJECTIVESTATE_HORDE && m_OldState != m_State )
     {
-        sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_H));
+        sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_H));
         ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_EWT] = 0;
     }
 
@@ -58,14 +58,14 @@ void OPvPCapturePointEP_EWT::ChangeState()
             artkit = 2;
             SummonSupportUnitAtNorthpassTower(ALLIANCE);
             ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_EWT] = ALLIANCE;
-            if (m_OldState != m_State) sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_EWT_A));
+            if (m_OldState != m_State) sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_EWT_A));
             break;
         case OBJECTIVESTATE_HORDE:
             m_TowerState = EP_TS_H;
             artkit = 1;
             SummonSupportUnitAtNorthpassTower(HORDE);
             ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_EWT] = HORDE;
-            if (m_OldState != m_State) sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_EWT_H));
+            if (m_OldState != m_State) sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_EWT_H));
             break;
         case OBJECTIVESTATE_NEUTRAL:
             m_TowerState = EP_TS_N;
@@ -178,12 +178,12 @@ void OPvPCapturePointEP_NPT::ChangeState()
     // if changing from controlling alliance to horde or vice versa
     if ( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State )
     {
-        sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_A));
+        sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_A));
         ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_NPT] = 0;
     }
     else if ( m_OldState == OBJECTIVESTATE_HORDE && m_OldState != m_State )
     {
-        sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_H));
+        sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_H));
         ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_NPT] = 0;
     }
 
@@ -196,14 +196,14 @@ void OPvPCapturePointEP_NPT::ChangeState()
             artkit = 2;
             SummonGO(ALLIANCE);
             ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_NPT] = ALLIANCE;
-            if (m_OldState != m_State) sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_NPT_A));
+            if (m_OldState != m_State) sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_NPT_A));
             break;
         case OBJECTIVESTATE_HORDE:
             m_TowerState = EP_TS_H;
             artkit = 1;
             SummonGO(HORDE);
             ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_NPT] = HORDE;
-            if (m_OldState != m_State) sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_NPT_H));
+            if (m_OldState != m_State) sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_NPT_H));
             break;
         case OBJECTIVESTATE_NEUTRAL:
             m_TowerState = EP_TS_N;
@@ -321,12 +321,12 @@ void OPvPCapturePointEP_CGT::ChangeState()
     // if changing from controlling alliance to horde or vice versa
     if( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State )
     {
-        sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_A));
+        sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_A));
         ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_CGT] = 0;
     }
     else if ( m_OldState == OBJECTIVESTATE_HORDE && m_OldState != m_State )
     {
-        sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_H));
+        sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_H));
         ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_CGT] = 0;
     }
 
@@ -339,14 +339,14 @@ void OPvPCapturePointEP_CGT::ChangeState()
             artkit = 2;
             LinkGraveYard(ALLIANCE);
             ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_CGT] = ALLIANCE;
-            if (m_OldState != m_State) sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_CGT_A));
+            if (m_OldState != m_State) sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_CGT_A));
             break;
         case OBJECTIVESTATE_HORDE:
             m_TowerState = EP_TS_H;
             artkit = 1;
             LinkGraveYard(HORDE);
             ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_CGT] = HORDE;
-            if (m_OldState != m_State) sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_CGT_H));
+            if (m_OldState != m_State) sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_CGT_H));
             break;
         case OBJECTIVESTATE_NEUTRAL:
             m_TowerState = EP_TS_N;
@@ -432,8 +432,8 @@ void OPvPCapturePointEP_CGT::LinkGraveYard(uint32 team)
     if (m_GraveyardSide != team)
     {
         m_GraveyardSide = team;
-        sObjectMgr.RemoveGraveYardLink(EP_GraveYardId,EP_GraveYardZone,team,false);
-        sObjectMgr.AddGraveYardLink(EP_GraveYardId,EP_GraveYardZone,team,false);
+        sObjectMgr->RemoveGraveYardLink(EP_GraveYardId,EP_GraveYardZone,team,false);
+        sObjectMgr->AddGraveYardLink(EP_GraveYardId,EP_GraveYardZone,team,false);
     }
 }
 
@@ -450,12 +450,12 @@ void OPvPCapturePointEP_PWT::ChangeState()
     // if changing from controlling alliance to horde or vice versa
     if ( m_OldState == OBJECTIVESTATE_ALLIANCE && m_OldState != m_State )
     {
-        sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_A));
+        sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_A));
         ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_PWT] = 0;
     }
     else if ( m_OldState == OBJECTIVESTATE_HORDE && m_OldState != m_State )
     {
-        sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_H));
+        sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_H));
         ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_PWT] = 0;
     }
 
@@ -468,14 +468,14 @@ void OPvPCapturePointEP_PWT::ChangeState()
             SummonFlightMaster(ALLIANCE);
             artkit = 2;
             ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_PWT] = ALLIANCE;
-            if (m_OldState != m_State) sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_PWT_A));
+            if (m_OldState != m_State) sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_PWT_A));
             break;
         case OBJECTIVESTATE_HORDE:
             m_TowerState = EP_TS_H;
             SummonFlightMaster(HORDE);
             artkit = 1;
             ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_PWT] = HORDE;
-            if (m_OldState != m_State) sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_PWT_H));
+            if (m_OldState != m_State) sWorld.SendZoneText(EP_GraveYardZone,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_CAPTURE_PWT_H));
             break;
         case OBJECTIVESTATE_NEUTRAL:
             m_TowerState = EP_TS_N;
@@ -584,7 +584,7 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team)
             GossipOption gso;
             gso.Action = GOSSIP_OPTION_OUTDOORPVP;
             gso.GossipId = 0;
-            gso.OptionText.assign(sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_FLIGHT_NPT));
+            gso.OptionText.assign(sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_FLIGHT_NPT));
             gso.Id = 50;
             gso.Icon = 0;
             gso.NpcFlag = 0;
@@ -594,7 +594,7 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team)
 
             gso.Action = GOSSIP_OPTION_OUTDOORPVP;
             gso.GossipId = 0;
-            gso.OptionText.assign(sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_FLIGHT_EWT));
+            gso.OptionText.assign(sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_FLIGHT_EWT));
             gso.Id = 50;
             gso.Icon = 0;
             gso.NpcFlag = 0;
@@ -604,7 +604,7 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team)
 
             gso.Action = GOSSIP_OPTION_OUTDOORPVP;
             gso.GossipId = 0;
-            gso.OptionText.assign(sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_FLIGHT_CGT));
+            gso.OptionText.assign(sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_EP_FLIGHT_CGT));
             gso.Id = 50;
             gso.Icon = 0;
             gso.NpcFlag = 0;
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp
index c53945dbe42..ec38838dcf6 100755
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp
@@ -175,13 +175,13 @@ void OPvPCapturePointHP::ChangeState()
         field = HP_MAP_A[m_TowerType];
         if (((OutdoorPvPHP*)m_PvP)->m_AllianceTowersControlled)
             ((OutdoorPvPHP*)m_PvP)->m_AllianceTowersControlled--;
-        sWorld.SendZoneText(OutdoorPvPHPBuffZones[0],sObjectMgr.GetTrinityStringForDBCLocale(HP_LANG_LOSE_A[m_TowerType]));
+        sWorld.SendZoneText(OutdoorPvPHPBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_LOSE_A[m_TowerType]));
         break;
     case OBJECTIVESTATE_HORDE:
         field = HP_MAP_H[m_TowerType];
         if (((OutdoorPvPHP*)m_PvP)->m_HordeTowersControlled)
             ((OutdoorPvPHP*)m_PvP)->m_HordeTowersControlled--;
-        sWorld.SendZoneText(OutdoorPvPHPBuffZones[0],sObjectMgr.GetTrinityStringForDBCLocale(HP_LANG_LOSE_H[m_TowerType]));
+        sWorld.SendZoneText(OutdoorPvPHPBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_LOSE_H[m_TowerType]));
         break;
     case OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE:
         field = HP_MAP_N[m_TowerType];
@@ -216,7 +216,7 @@ void OPvPCapturePointHP::ChangeState()
         artkit2 = HP_TowerArtKit_A[m_TowerType];
         if (((OutdoorPvPHP*)m_PvP)->m_AllianceTowersControlled<3)
             ((OutdoorPvPHP*)m_PvP)->m_AllianceTowersControlled++;
-        sWorld.SendZoneText(OutdoorPvPHPBuffZones[0],sObjectMgr.GetTrinityStringForDBCLocale(HP_LANG_CAPTURE_A[m_TowerType]));
+        sWorld.SendZoneText(OutdoorPvPHPBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_CAPTURE_A[m_TowerType]));
         break;
     case OBJECTIVESTATE_HORDE:
         field = HP_MAP_H[m_TowerType];
@@ -224,7 +224,7 @@ void OPvPCapturePointHP::ChangeState()
         artkit2 = HP_TowerArtKit_H[m_TowerType];
         if (((OutdoorPvPHP*)m_PvP)->m_HordeTowersControlled<3)
             ((OutdoorPvPHP*)m_PvP)->m_HordeTowersControlled++;
-        sWorld.SendZoneText(OutdoorPvPHPBuffZones[0],sObjectMgr.GetTrinityStringForDBCLocale(HP_LANG_CAPTURE_H[m_TowerType]));
+        sWorld.SendZoneText(OutdoorPvPHPBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(HP_LANG_CAPTURE_H[m_TowerType]));
         break;
     case OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE:
         field = HP_MAP_N[m_TowerType];
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
index d5bc0e14147..1144ac970e6 100755
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
@@ -69,7 +69,7 @@ uint32 OPvPCapturePointNA::GetAliveGuardsCount()
                     if (cr->isAlive())
                         ++cnt;
                 }
-                else if (CreatureData const * cd = sObjectMgr.GetCreatureData(GUID_LOPART(itr->second)))
+                else if (CreatureData const * cd = sObjectMgr->GetCreatureData(GUID_LOPART(itr->second)))
                 {
                     if (!cd->is_dead)
                         ++cnt;
@@ -137,15 +137,15 @@ void OPvPCapturePointNA::DeSpawnGOs()
 void OPvPCapturePointNA::FactionTakeOver(uint32 team)
 {
     if (m_ControllingFaction)
-        sObjectMgr.RemoveGraveYardLink(NA_HALAA_GRAVEYARD,NA_HALAA_GRAVEYARD_ZONE,m_ControllingFaction,false);
+        sObjectMgr->RemoveGraveYardLink(NA_HALAA_GRAVEYARD,NA_HALAA_GRAVEYARD_ZONE,m_ControllingFaction,false);
     if (m_ControllingFaction == ALLIANCE)
-        sWorld.SendZoneText(NA_HALAA_GRAVEYARD_ZONE,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_NA_LOSE_A));
+        sWorld.SendZoneText(NA_HALAA_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_LOSE_A));
     else if (m_ControllingFaction == HORDE)
-        sWorld.SendZoneText(NA_HALAA_GRAVEYARD_ZONE,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_NA_LOSE_H));
+        sWorld.SendZoneText(NA_HALAA_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_LOSE_H));
 
     m_ControllingFaction = team;
     if (m_ControllingFaction)
-        sObjectMgr.AddGraveYardLink(NA_HALAA_GRAVEYARD,NA_HALAA_GRAVEYARD_ZONE,m_ControllingFaction,false);
+        sObjectMgr->AddGraveYardLink(NA_HALAA_GRAVEYARD,NA_HALAA_GRAVEYARD_ZONE,m_ControllingFaction,false);
     DeSpawnGOs();
     DeSpawnNPCs();
     SpawnGOsForTeam(team);
@@ -163,7 +163,7 @@ void OPvPCapturePointNA::FactionTakeOver(uint32 team)
         m_PvP->SendUpdateWorldState(NA_UI_HORDE_GUARDS_SHOW, 0);
         m_PvP->SendUpdateWorldState(NA_UI_ALLIANCE_GUARDS_SHOW, 1);
         m_PvP->SendUpdateWorldState(NA_UI_GUARDS_LEFT, m_GuardsAlive);
-        sWorld.SendZoneText(NA_HALAA_GRAVEYARD_ZONE,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_NA_CAPTURE_A));
+        sWorld.SendZoneText(NA_HALAA_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_CAPTURE_A));
     }
     else
     {
@@ -175,7 +175,7 @@ void OPvPCapturePointNA::FactionTakeOver(uint32 team)
         m_PvP->SendUpdateWorldState(NA_UI_HORDE_GUARDS_SHOW, 1);
         m_PvP->SendUpdateWorldState(NA_UI_ALLIANCE_GUARDS_SHOW, 0);
         m_PvP->SendUpdateWorldState(NA_UI_GUARDS_LEFT, m_GuardsAlive);
-        sWorld.SendZoneText(NA_HALAA_GRAVEYARD_ZONE,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_NA_CAPTURE_H));
+        sWorld.SendZoneText(NA_HALAA_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_NA_CAPTURE_H));
     }
     UpdateWyvernRoostWorldState(NA_ROOST_S);
     UpdateWyvernRoostWorldState(NA_ROOST_N);
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
index 4d92c03c4c7..88f992891ef 100755
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
@@ -94,7 +94,7 @@ bool OutdoorPvPSI::HandleAreaTrigger(Player *plr, uint32 trigger)
             if (m_Gathered_A >= SI_MAX_RESOURCES)
             {
                 TeamApplyBuff(TEAM_ALLIANCE, SI_CENARION_FAVOR);
-                sWorld.SendZoneText(OutdoorPvPSIBuffZones[0],sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_SI_CAPTURE_A));
+                sWorld.SendZoneText(OutdoorPvPSIBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_SI_CAPTURE_A));
                 m_LastController = ALLIANCE;
                 m_Gathered_A = 0;
                 m_Gathered_H = 0;
@@ -119,7 +119,7 @@ bool OutdoorPvPSI::HandleAreaTrigger(Player *plr, uint32 trigger)
             if (m_Gathered_H >= SI_MAX_RESOURCES)
             {
                 TeamApplyBuff(TEAM_HORDE, SI_CENARION_FAVOR);
-                sWorld.SendZoneText(OutdoorPvPSIBuffZones[0],sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_SI_CAPTURE_H));
+                sWorld.SendZoneText(OutdoorPvPSIBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_SI_CAPTURE_H));
                 m_LastController = HORDE;
                 m_Gathered_A = 0;
                 m_Gathered_H = 0;
@@ -163,7 +163,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId)
                             return true;
                         }
 
-                        if (!go->Create(sObjectMgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT),SI_SILITHYST_MOUND, map, plr->GetPhaseMask(), plr->GetPositionX(),plr->GetPositionY(),plr->GetPositionZ(),plr->GetOrientation(),0,0,0,0,100,GO_STATE_READY))
+                        if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT),SI_SILITHYST_MOUND, map, plr->GetPhaseMask(), plr->GetPositionX(),plr->GetPositionY(),plr->GetPositionZ(),plr->GetOrientation(),0,0,0,0,100,GO_STATE_READY))
                         {
                             delete go;
                         }
@@ -192,7 +192,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId)
                           delete go;
                           return true;
                           }
-                        if (!go->Create(sObjectMgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT),SI_SILITHYST_MOUND, map, plr->GetPhaseMask() ,plr->GetPositionX(),plr->GetPositionY(),plr->GetPositionZ(),plr->GetOrientation(),0,0,0,0,100,GO_STATE_READY))
+                        if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT),SI_SILITHYST_MOUND, map, plr->GetPhaseMask() ,plr->GetPositionX(),plr->GetPositionY(),plr->GetPositionZ(),plr->GetOrientation(),0,0,0,0,100,GO_STATE_READY))
                         {
                             delete go;
                         }
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp
index 53e8052a26d..5a47cdf8ef3 100755
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp
@@ -250,14 +250,14 @@ void OPvPCapturePointTF::ChangeState()
     {
         if (((OutdoorPvPTF*)m_PvP)->m_AllianceTowersControlled)
             ((OutdoorPvPTF*)m_PvP)->m_AllianceTowersControlled--;
-        sWorld.SendZoneText(OutdoorPvPTFBuffZones[0],sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_TF_LOSE_A));
+        sWorld.SendZoneText(OutdoorPvPTFBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_LOSE_A));
     }
     // if changing from controlling horde to alliance
     else if (m_OldState == OBJECTIVESTATE_HORDE)
     {
         if (((OutdoorPvPTF*)m_PvP)->m_HordeTowersControlled)
             ((OutdoorPvPTF*)m_PvP)->m_HordeTowersControlled--;
-        sWorld.SendZoneText(OutdoorPvPTFBuffZones[0],sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_TF_LOSE_H));
+        sWorld.SendZoneText(OutdoorPvPTFBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_LOSE_H));
     }
 
     uint32 artkit = 21;
@@ -269,7 +269,7 @@ void OPvPCapturePointTF::ChangeState()
         artkit = 2;
         if (((OutdoorPvPTF*)m_PvP)->m_AllianceTowersControlled<TF_TOWER_NUM)
             ((OutdoorPvPTF*)m_PvP)->m_AllianceTowersControlled++;
-        sWorld.SendZoneText(OutdoorPvPTFBuffZones[0],sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_TF_CAPTURE_A));
+        sWorld.SendZoneText(OutdoorPvPTFBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_CAPTURE_A));
         for (PlayerSet::iterator itr = m_activePlayers[0].begin(); itr != m_activePlayers[0].end(); ++itr)
             (*itr)->AreaExploredOrEventHappens(TF_ALLY_QUEST);
         break;
@@ -278,7 +278,7 @@ void OPvPCapturePointTF::ChangeState()
         artkit = 1;
         if (((OutdoorPvPTF*)m_PvP)->m_HordeTowersControlled<TF_TOWER_NUM)
             ((OutdoorPvPTF*)m_PvP)->m_HordeTowersControlled++;
-        sWorld.SendZoneText(OutdoorPvPTFBuffZones[0],sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_TF_CAPTURE_H));
+        sWorld.SendZoneText(OutdoorPvPTFBuffZones[0],sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_TF_CAPTURE_H));
         for (PlayerSet::iterator itr = m_activePlayers[1].begin(); itr != m_activePlayers[1].end(); ++itr)
             (*itr)->AreaExploredOrEventHappens(TF_HORDE_QUEST);
         break;
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
index bdaf0961d2c..cc31dfe672f 100755
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
@@ -78,14 +78,14 @@ void OPvPCapturePointZM_Beacon::ChangeState()
     {
         if (((OutdoorPvPZM*)m_PvP)->m_AllianceTowersControlled)
             ((OutdoorPvPZM*)m_PvP)->m_AllianceTowersControlled--;
-        sWorld.SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr.GetTrinityStringForDBCLocale(ZMBeaconLoseA[m_TowerType]));
+        sWorld.SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconLoseA[m_TowerType]));
     }
     // if changing from controlling horde to alliance
     else if (m_OldState == OBJECTIVESTATE_HORDE)
     {
         if (((OutdoorPvPZM*)m_PvP)->m_HordeTowersControlled)
             ((OutdoorPvPZM*)m_PvP)->m_HordeTowersControlled--;
-        sWorld.SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr.GetTrinityStringForDBCLocale(ZMBeaconLoseH[m_TowerType]));
+        sWorld.SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconLoseH[m_TowerType]));
     }
 
     switch(m_State)
@@ -94,13 +94,13 @@ void OPvPCapturePointZM_Beacon::ChangeState()
             m_TowerState = ZM_TOWERSTATE_A;
             if (((OutdoorPvPZM*)m_PvP)->m_AllianceTowersControlled<ZM_NUM_BEACONS)
                 ((OutdoorPvPZM*)m_PvP)->m_AllianceTowersControlled++;
-            sWorld.SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr.GetTrinityStringForDBCLocale(ZMBeaconCaptureA[m_TowerType]));
+            sWorld.SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconCaptureA[m_TowerType]));
             break;
         case OBJECTIVESTATE_HORDE:
             m_TowerState = ZM_TOWERSTATE_H;
             if (((OutdoorPvPZM*)m_PvP)->m_HordeTowersControlled<ZM_NUM_BEACONS)
                 ((OutdoorPvPZM*)m_PvP)->m_HordeTowersControlled++;
-            sWorld.SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr.GetTrinityStringForDBCLocale(ZMBeaconCaptureH[m_TowerType]));
+            sWorld.SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(ZMBeaconCaptureH[m_TowerType]));
             break;
         case OBJECTIVESTATE_NEUTRAL:
         case OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE:
@@ -216,28 +216,28 @@ int32 OPvPCapturePointZM_GraveYard::HandleOpenGo(Player *plr, uint64 guid)
         if (plr->HasAura(ZM_BATTLE_STANDARD_A) && m_GraveYardState != ZM_GRAVEYARD_A)
         {
             if (m_GraveYardState == ZM_GRAVEYARD_H)
-                sWorld.SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_H));
+                sWorld.SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_H));
             m_GraveYardState = ZM_GRAVEYARD_A;
             DelObject(0);   // only one gotype is used in the whole outdoor pvp, no need to call it a constant
             AddObject(0,ZM_Banner_A.entry,ZM_Banner_A.map,ZM_Banner_A.x,ZM_Banner_A.y,ZM_Banner_A.z,ZM_Banner_A.o,ZM_Banner_A.rot0,ZM_Banner_A.rot1,ZM_Banner_A.rot2,ZM_Banner_A.rot3);
-            sObjectMgr.RemoveGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, HORDE);          // rem gy
-            sObjectMgr.AddGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, ALLIANCE, false);   // add gy
+            sObjectMgr->RemoveGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, HORDE);          // rem gy
+            sObjectMgr->AddGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, ALLIANCE, false);   // add gy
             m_PvP->TeamApplyBuff(TEAM_ALLIANCE, ZM_CAPTURE_BUFF);
             plr->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_A);
-            sWorld.SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_A));
+            sWorld.SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_A));
         }
         else if (plr->HasAura(ZM_BATTLE_STANDARD_H) && m_GraveYardState != ZM_GRAVEYARD_H)
         {
             if (m_GraveYardState == ZM_GRAVEYARD_A)
-                sWorld.SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_A));
+                sWorld.SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_LOSE_GY_A));
             m_GraveYardState = ZM_GRAVEYARD_H;
             DelObject(0);   // only one gotype is used in the whole outdoor pvp, no need to call it a constant
             AddObject(0,ZM_Banner_H.entry,ZM_Banner_H.map,ZM_Banner_H.x,ZM_Banner_H.y,ZM_Banner_H.z,ZM_Banner_H.o,ZM_Banner_H.rot0,ZM_Banner_H.rot1,ZM_Banner_H.rot2,ZM_Banner_H.rot3);
-            sObjectMgr.RemoveGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, ALLIANCE);          // rem gy
-            sObjectMgr.AddGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, HORDE, false);   // add gy
+            sObjectMgr->RemoveGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, ALLIANCE);          // rem gy
+            sObjectMgr->AddGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, HORDE, false);   // add gy
             m_PvP->TeamApplyBuff(TEAM_HORDE, ZM_CAPTURE_BUFF);
             plr->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_H);
-            sWorld.SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr.GetTrinityStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_H));
+            sWorld.SendZoneText(ZM_GRAVEYARD_ZONE,sObjectMgr->GetTrinityStringForDBCLocale(LANG_OPVP_ZM_CAPTURE_GY_H));
         }
         UpdateTowerState();
     }
@@ -311,7 +311,7 @@ void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction)
             if (m_FlagCarrierGUID)
             {
                 // remove flag from carrier, reset flag carrier guid
-                Player * p = sObjectMgr.GetPlayer(m_FlagCarrierGUID);
+                Player * p = sObjectMgr->GetPlayer(m_FlagCarrierGUID);
                 if (p)
                 {
                    p->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_A);
diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp
index c63a699fed0..b237ead269d 100644
--- a/src/server/scripts/Spells/spell_paladin.cpp
+++ b/src/server/scripts/Spells/spell_paladin.cpp
@@ -183,13 +183,13 @@ public:
                 return false;
 
             // can't use other spell than holy shock due to spell_ranks dependency
-            if (sSpellMgr.GetFirstSpellInChain(PALADIN_SPELL_HOLY_SHOCK_R1) != sSpellMgr.GetFirstSpellInChain(spellEntry->Id))
+            if (sSpellMgr->GetFirstSpellInChain(PALADIN_SPELL_HOLY_SHOCK_R1) != sSpellMgr->GetFirstSpellInChain(spellEntry->Id))
                 return false;
 
-            uint8 rank = sSpellMgr.GetSpellRank(spellEntry->Id);
-            if (!sSpellMgr.GetSpellWithRank(PALADIN_SPELL_HOLY_SHOCK_R1_DAMAGE, rank, true))
+            uint8 rank = sSpellMgr->GetSpellRank(spellEntry->Id);
+            if (!sSpellMgr->GetSpellWithRank(PALADIN_SPELL_HOLY_SHOCK_R1_DAMAGE, rank, true))
                 return false;
-            if (!sSpellMgr.GetSpellWithRank(PALADIN_SPELL_HOLY_SHOCK_R1_HEALING, rank, true))
+            if (!sSpellMgr->GetSpellWithRank(PALADIN_SPELL_HOLY_SHOCK_R1_HEALING, rank, true))
                 return false;
 
             return true;
@@ -201,12 +201,12 @@ public:
             {
                 Unit *caster = GetCaster();
 
-                uint8 rank = sSpellMgr.GetSpellRank(GetSpellInfo()->Id);
+                uint8 rank = sSpellMgr->GetSpellRank(GetSpellInfo()->Id);
 
                 if (caster->IsFriendlyTo(unitTarget))
-                    caster->CastSpell(unitTarget, sSpellMgr.GetSpellWithRank(PALADIN_SPELL_HOLY_SHOCK_R1_HEALING, rank), true, 0);
+                    caster->CastSpell(unitTarget, sSpellMgr->GetSpellWithRank(PALADIN_SPELL_HOLY_SHOCK_R1_HEALING, rank), true, 0);
                 else
-                    caster->CastSpell(unitTarget, sSpellMgr.GetSpellWithRank(PALADIN_SPELL_HOLY_SHOCK_R1_DAMAGE, rank), true, 0);
+                    caster->CastSpell(unitTarget, sSpellMgr->GetSpellWithRank(PALADIN_SPELL_HOLY_SHOCK_R1_DAMAGE, rank), true, 0);
             }
         }
 
diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp
index 5359cbaf252..6631d840309 100644
--- a/src/server/scripts/Spells/spell_priest.cpp
+++ b/src/server/scripts/Spells/spell_priest.cpp
@@ -107,13 +107,13 @@ class spell_pri_penance : public SpellScriptLoader
                 if (!sSpellStore.LookupEntry(PRIEST_SPELL_PENANCE_R1))
                     return false;
                 // can't use other spell than this penance due to spell_ranks dependency
-                if (sSpellMgr.GetFirstSpellInChain(PRIEST_SPELL_PENANCE_R1) != sSpellMgr.GetFirstSpellInChain(spellEntry->Id))
+                if (sSpellMgr->GetFirstSpellInChain(PRIEST_SPELL_PENANCE_R1) != sSpellMgr->GetFirstSpellInChain(spellEntry->Id))
                     return false;
 
-                uint8 rank = sSpellMgr.GetSpellRank(spellEntry->Id);
-                if (!sSpellMgr.GetSpellWithRank(PRIEST_SPELL_PENANCE_R1_DAMAGE, rank, true))
+                uint8 rank = sSpellMgr->GetSpellRank(spellEntry->Id);
+                if (!sSpellMgr->GetSpellWithRank(PRIEST_SPELL_PENANCE_R1_DAMAGE, rank, true))
                     return false;
-                if (!sSpellMgr.GetSpellWithRank(PRIEST_SPELL_PENANCE_R1_HEAL, rank, true))
+                if (!sSpellMgr->GetSpellWithRank(PRIEST_SPELL_PENANCE_R1_HEAL, rank, true))
                     return false;
 
                 return true;
@@ -127,12 +127,12 @@ class spell_pri_penance : public SpellScriptLoader
 
                 Unit *caster = GetCaster();
 
-                uint8 rank = sSpellMgr.GetSpellRank(GetSpellInfo()->Id);
+                uint8 rank = sSpellMgr->GetSpellRank(GetSpellInfo()->Id);
 
                 if (caster->IsFriendlyTo(unitTarget))
-                    caster->CastSpell(unitTarget, sSpellMgr.GetSpellWithRank(PRIEST_SPELL_PENANCE_R1_HEAL, rank), false, 0);
+                    caster->CastSpell(unitTarget, sSpellMgr->GetSpellWithRank(PRIEST_SPELL_PENANCE_R1_HEAL, rank), false, 0);
                 else
-                    caster->CastSpell(unitTarget, sSpellMgr.GetSpellWithRank(PRIEST_SPELL_PENANCE_R1_DAMAGE, rank), false, 0);
+                    caster->CastSpell(unitTarget, sSpellMgr->GetSpellWithRank(PRIEST_SPELL_PENANCE_R1_DAMAGE, rank), false, 0);
             }
 
             void Register()
diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp
index d65874068df..640faaad64f 100644
--- a/src/server/scripts/Spells/spell_shaman.cpp
+++ b/src/server/scripts/Spells/spell_shaman.cpp
@@ -49,11 +49,11 @@ public:
         {
             if (!sSpellStore.LookupEntry(SHAMAN_SPELL_FIRE_NOVA_R1))
                 return false;
-            if (sSpellMgr.GetFirstSpellInChain(SHAMAN_SPELL_FIRE_NOVA_R1) != sSpellMgr.GetFirstSpellInChain(spellEntry->Id))
+            if (sSpellMgr->GetFirstSpellInChain(SHAMAN_SPELL_FIRE_NOVA_R1) != sSpellMgr->GetFirstSpellInChain(spellEntry->Id))
                 return false;
 
-            uint8 rank = sSpellMgr.GetSpellRank(spellEntry->Id);
-            if (!sSpellMgr.GetSpellWithRank(SHAMAN_SPELL_FIRE_NOVA_TRIGGERED_R1, rank, true))
+            uint8 rank = sSpellMgr->GetSpellRank(spellEntry->Id);
+            if (!sSpellMgr->GetSpellWithRank(SHAMAN_SPELL_FIRE_NOVA_TRIGGERED_R1, rank, true))
                 return false;
             return true;
         }
@@ -62,8 +62,8 @@ public:
         {
             if (Unit* caster = GetCaster())
             {
-                uint8 rank = sSpellMgr.GetSpellRank(GetSpellInfo()->Id);
-                uint32 spellId = sSpellMgr.GetSpellWithRank(SHAMAN_SPELL_FIRE_NOVA_TRIGGERED_R1, rank);
+                uint8 rank = sSpellMgr->GetSpellRank(GetSpellInfo()->Id);
+                uint32 spellId = sSpellMgr->GetSpellWithRank(SHAMAN_SPELL_FIRE_NOVA_TRIGGERED_R1, rank);
                 // fire slot
                 if (spellId && caster->m_SummonSlot[1])
                 {
diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp
index e3a341fa0ec..0338569b3e6 100644
--- a/src/server/scripts/Spells/spell_warlock.cpp
+++ b/src/server/scripts/Spells/spell_warlock.cpp
@@ -172,7 +172,7 @@ public:
                             break;
                     }
                 }
-                uint8 spellRank = sSpellMgr.GetSpellRank(GetSpellInfo()->Id);
+                uint8 spellRank = sSpellMgr->GetSpellRank(GetSpellInfo()->Id);
                 if (spellRank > 0 && spellRank <= 8)
                     CreateItem(effIndex, iTypes[spellRank - 1][rank]);
             }
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp
index 887b862c6c1..8c903a67df6 100644
--- a/src/server/scripts/World/go_scripts.cpp
+++ b/src/server/scripts/World/go_scripts.cpp
@@ -1005,7 +1005,7 @@ public:
         if (!pPrisoner || !pPrisoner->isAlive())
             return true;
 
-        Quest const* qInfo = sObjectMgr.GetQuestTemplate(QUEST_PRISONERS_OF_WYRMSKULL);
+        Quest const* qInfo = sObjectMgr->GetQuestTemplate(QUEST_PRISONERS_OF_WYRMSKULL);
         if (qInfo)
         {
             //TODO: prisoner should help player for a short period of time