Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Events/GameEventMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/worldserver/worldserver.conf.dist

1 files changed, 6 insertions, 105 deletions

diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 2317d89ae24..7a43a6d763a 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -297,7 +297,6 @@ void ObjectMgr::LoadCreatureLocales()
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %lu creature locale strings in %u ms", (unsigned long)_creatureLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadGossipMenuItemsLocales()
@@ -334,7 +333,6 @@ void ObjectMgr::LoadGossipMenuItemsLocales()
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %lu gossip_menu_option locale strings in %u ms", (unsigned long)_gossipMenuItemsLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadPointOfInterestLocales()
@@ -361,7 +359,6 @@ void ObjectMgr::LoadPointOfInterestLocales()
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %lu points_of_interest locale strings in %u ms", (unsigned long)_pointOfInterestLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadCreatureTemplates()
@@ -389,7 +386,6 @@ void ObjectMgr::LoadCreatureTemplates()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 creature template definitions. DB table `creature_template` is empty.");
-
         return;
     }
 
@@ -495,7 +491,6 @@ void ObjectMgr::LoadCreatureTemplates()
         CheckCreatureTemplate(&itr->second);
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u creature definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadCreatureTemplateAddons()
@@ -508,7 +503,6 @@ void ObjectMgr::LoadCreatureTemplateAddons()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 creature template addon definitions. DB table `creature_template_addon` is empty.");
-
         return;
     }
 
@@ -567,7 +561,6 @@ void ObjectMgr::LoadCreatureTemplateAddons()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u creature template addons in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo)
@@ -891,7 +884,6 @@ void ObjectMgr::LoadCreatureAddons()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 creature addon definitions. DB table `creature_addon` is empty.");
-
         return;
     }
 
@@ -957,7 +949,6 @@ void ObjectMgr::LoadCreatureAddons()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u creature addons in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 CreatureAddon const* ObjectMgr::GetCreatureAddon(uint32 lowguid)
@@ -996,7 +987,6 @@ void ObjectMgr::LoadEquipmentTemplates()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 creature equipment templates. DB table `creature_equip_template` is empty!");
-
         return;
     }
 
@@ -1049,7 +1039,6 @@ void ObjectMgr::LoadEquipmentTemplates()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u equipment templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 CreatureModelInfo const* ObjectMgr::GetCreatureModelInfo(uint32 modelId)
@@ -1127,7 +1116,6 @@ void ObjectMgr::LoadCreatureModelInfo()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 creature model definitions. DB table `creature_model_info` is empty.");
-
         return;
     }
 
@@ -1172,7 +1160,6 @@ void ObjectMgr::LoadCreatureModelInfo()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u creature model based info in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadLinkedRespawn()
@@ -1358,7 +1345,6 @@ void ObjectMgr::LoadLinkedRespawn()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded " UI64FMTD " linked respawns in %u ms", uint64(_linkedRespawnStore.size()), GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 bool ObjectMgr::SetCreatureLinkedRespawn(uint32 guidLow, uint32 linkedGuidLow)
@@ -1545,7 +1531,6 @@ void ObjectMgr::LoadCreatures()
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u creatures in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::AddCreatureToGrid(uint32 guid, CreatureData const* data)
@@ -1850,7 +1835,6 @@ void ObjectMgr::LoadGameobjects()
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %lu gameobjects in %u ms", (unsigned long)_gameObjectDataStore.size(), GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::AddGameobjectToGrid(uint32 guid, GameObjectData const* data)
@@ -2019,7 +2003,6 @@ void ObjectMgr::LoadItemLocales()
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %lu Item locale strings in %u ms", (unsigned long)_itemLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void FillItemDamageFields(float* minDamage, float* maxDamage, float* dps, uint32 itemLevel, uint32 itemClass, uint32 itemSubClass, uint32 quality, uint32 delay, float statScalingFactor, uint32 inventoryType, uint32 flags2)
@@ -2572,7 +2555,6 @@ void ObjectMgr::LoadItemTemplateAddon()
                 sLog->outError(LOG_FILTER_SQL, "Minimum money loot specified in `item_template_addon` for item %u was greater than maximum amount, swapping.", itemId);
                 std::swap(minMoneyLoot, maxMoneyLoot);
             }
-
             ItemTemplate& itemTemplate = _itemTemplateStore[itemId];
             itemTemplate.FlagsCu = fields[1].GetUInt32();
             itemTemplate.FoodType = fields[2].GetUInt8();
@@ -2617,7 +2599,6 @@ ItemTemplate const* ObjectMgr::GetItemTemplate(uint32 entry)
     ItemTemplateContainer::const_iterator itr = _itemTemplateStore.find(entry);
     if (itr != _itemTemplateStore.end())
         return &(itr->second);
-
     return NULL;
 }
 
@@ -2675,7 +2656,6 @@ void ObjectMgr::LoadVehicleTemplateAccessories()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u Vehicle Template Accessories in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadVehicleAccessories()
@@ -2692,7 +2672,6 @@ void ObjectMgr::LoadVehicleAccessories()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 Vehicle Accessories in %u ms", GetMSTimeDiffToNow(oldMSTime));
-
         return;
     }
 
@@ -2720,7 +2699,6 @@ void ObjectMgr::LoadVehicleAccessories()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u Vehicle Accessories in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadPetLevelInfo()
@@ -2813,7 +2791,6 @@ void ObjectMgr::LoadPetLevelInfo()
     }
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u level pet stats definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 PetLevelInfo const* ObjectMgr::GetPetLevelInfo(uint32 creature_id, uint8 level) const
@@ -2955,12 +2932,11 @@ void ObjectMgr::LoadPlayerInfo()
             while (result->NextRow());
 
             sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u player create definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
         }
     }
 
     // Load playercreate items
-    sLog->outInfo(LOG_FILTER_GENERAL, "Loading Player Create Items Data...");
+    sLog->outInfo(LOG_FILTER_SERVER_LOADING, "Loading Player Create Items Data...");
     {
         uint32 oldMSTime = getMSTime();
         //                                                0     1      2       3
@@ -2969,7 +2945,6 @@ void ObjectMgr::LoadPlayerInfo()
         if (!result)
         {
             sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 custom player create items. DB table `playercreateinfo_item` is empty.");
-
         }
         else
         {
@@ -3027,12 +3002,11 @@ void ObjectMgr::LoadPlayerInfo()
             while (result->NextRow());
 
             sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u custom player create items in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
         }
     }
 
     // Load playercreate spells
-    sLog->outInfo(LOG_FILTER_GENERAL, "Loading Player Create Spell Data...");
+    sLog->outInfo(LOG_FILTER_SERVER_LOADING, "Loading Player Create Spell Data...");
     {
         uint32 oldMSTime = getMSTime();
 
@@ -3084,12 +3058,11 @@ void ObjectMgr::LoadPlayerInfo()
             while (result->NextRow());
 
             sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u player create spells in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
         }
     }
 
     // Load playercreate actions
-    sLog->outInfo(LOG_FILTER_GENERAL, "Loading Player Create Action Data...");
+    sLog->outInfo(LOG_FILTER_SERVER_LOADING, "Loading Player Create Action Data...");
     {
         uint32 oldMSTime = getMSTime();
 
@@ -3131,12 +3104,11 @@ void ObjectMgr::LoadPlayerInfo()
             while (result->NextRow());
 
             sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u player create actions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
         }
     }
 
     // Loading levels data (class/race dependent)
-    sLog->outInfo(LOG_FILTER_GENERAL, "Loading Player Create Level Stats Data...");
+    sLog->outInfo(LOG_FILTER_SERVER_LOADING, "Loading Player Create Level Stats Data...");
     {
         uint32 oldMSTime = getMSTime();
 
@@ -3246,11 +3218,10 @@ void ObjectMgr::LoadPlayerInfo()
         }
 
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u level stats definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
     }
 
     // Loading xp per level data
-    sLog->outInfo(LOG_FILTER_GENERAL, "Loading Player Create XP Data...");
+    sLog->outInfo(LOG_FILTER_SERVER_LOADING, "Loading Player Create XP Data...");
     {
         uint32 oldMSTime = getMSTime();
 
@@ -3305,7 +3276,6 @@ void ObjectMgr::LoadPlayerInfo()
         }
 
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u xp for level definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
     }
 }
 
@@ -4261,7 +4231,6 @@ void ObjectMgr::LoadQuests()
     }
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %lu quests definitions in %u ms", (unsigned long)_questTemplates.size(), GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadQuestLocales()
@@ -4315,7 +4284,6 @@ void ObjectMgr::LoadQuestLocales()
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %lu Quest locale strings in %u ms", (unsigned long)_questLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadScripts(ScriptsType type)
@@ -4333,7 +4301,7 @@ void ObjectMgr::LoadScripts(ScriptsType type)
     if (sScriptMgr->IsScriptScheduled())                    // function cannot be called when scripts are in use.
         return;
 
-    sLog->outInfo(LOG_FILTER_GENERAL, "Loading %s...", tableName.c_str());
+    sLog->outInfo(LOG_FILTER_SERVER_LOADING, "Loading %s...", tableName.c_str());
 
     scripts->clear();                                       // need for reload support
 
@@ -4344,7 +4312,6 @@ void ObjectMgr::LoadScripts(ScriptsType type)
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 script definitions. DB table `%s` is empty!", tableName.c_str());
-
         return;
     }
 
@@ -4636,7 +4603,6 @@ void ObjectMgr::LoadScripts(ScriptsType type)
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u script definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadGameObjectScripts()
@@ -4781,7 +4747,6 @@ void ObjectMgr::LoadSpellScriptNames()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 spell script names. DB table `spell_script_names` is empty!");
-
         return;
     }
 
@@ -4829,7 +4794,6 @@ void ObjectMgr::LoadSpellScriptNames()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u spell script names in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::ValidateSpellScripts()
@@ -4839,7 +4803,6 @@ void ObjectMgr::ValidateSpellScripts()
     if (_spellScriptsStore.empty())
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Validated 0 scripts.");
-
         return;
     }
 
@@ -4887,7 +4850,6 @@ void ObjectMgr::ValidateSpellScripts()
     }
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Validated %u scripts in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadPageTexts()
@@ -4900,7 +4862,6 @@ void ObjectMgr::LoadPageTexts()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 page texts. DB table `page_text` is empty!");
-
         return;
     }
 
@@ -4930,7 +4891,6 @@ void ObjectMgr::LoadPageTexts()
     }
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u page texts in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 PageText const* ObjectMgr::GetPageText(uint32 pageEntry)
@@ -4966,7 +4926,6 @@ void ObjectMgr::LoadPageTextLocales()
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %lu PageText locale strings in %u ms", (unsigned long)_pageTextLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadInstanceTemplate()
@@ -4979,7 +4938,6 @@ void ObjectMgr::LoadInstanceTemplate()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 instance templates. DB table `page_text` is empty!");
-
         return;
     }
 
@@ -5009,7 +4967,6 @@ void ObjectMgr::LoadInstanceTemplate()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u instance templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 InstanceTemplate const* ObjectMgr::GetInstanceTemplate(uint32 mapID)
@@ -5099,7 +5056,6 @@ void ObjectMgr::LoadInstanceEncounters()
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u instance encounters in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 GossipText const* ObjectMgr::GetGossipText(uint32 Text_ID) const
@@ -5120,7 +5076,6 @@ void ObjectMgr::LoadGossipText()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u npc texts", count);
-
         return;
     }
     _gossipTextStore.rehash(result->GetRowCount());
@@ -5160,7 +5115,6 @@ void ObjectMgr::LoadGossipText()
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u npc texts in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadNpcTextLocales()
@@ -5203,7 +5157,6 @@ void ObjectMgr::LoadNpcTextLocales()
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %lu NpcText locale strings in %u ms", (unsigned long)_npcTextLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 //not very fast function but it is called only once a day, or on starting-up
@@ -5229,7 +5182,6 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp)
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> No expired mails found.");
-
         return;                                             // any mails need to be returned or deleted
     }
 
@@ -5333,7 +5285,6 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp)
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Processed %u expired mails: %u deleted and %u returned in %u ms", deletedCount + returnedCount, deletedCount, returnedCount, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadQuestAreaTriggers()
@@ -5347,7 +5298,6 @@ void ObjectMgr::LoadQuestAreaTriggers()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 quest trigger points. DB table `areatrigger_involvedrelation` is empty.");
-
         return;
     }
 
@@ -5392,7 +5342,6 @@ void ObjectMgr::LoadQuestAreaTriggers()
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u quest trigger points in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadTavernAreaTriggers()
@@ -5406,7 +5355,6 @@ void ObjectMgr::LoadTavernAreaTriggers()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 tavern triggers. DB table `areatrigger_tavern` is empty.");
-
         return;
     }
 
@@ -5431,7 +5379,6 @@ void ObjectMgr::LoadTavernAreaTriggers()
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u tavern triggers in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadAreaTriggerScripts()
@@ -5444,7 +5391,6 @@ void ObjectMgr::LoadAreaTriggerScripts()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 areatrigger scripts. DB table `areatrigger_scripts` is empty.");
-
         return;
     }
 
@@ -5469,7 +5415,6 @@ void ObjectMgr::LoadAreaTriggerScripts()
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u areatrigger scripts in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 uint32 ObjectMgr::GetNearestTaxiNode(float x, float y, float z, uint32 mapid, uint32 team)
@@ -5588,7 +5533,6 @@ void ObjectMgr::LoadGraveyardZones()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 graveyard-zone links. DB table `game_graveyard_zone` is empty.");
-
         return;
     }
 
@@ -5635,7 +5579,6 @@ void ObjectMgr::LoadGraveyardZones()
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u graveyard-zone links in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 WorldSafeLocsEntry const* ObjectMgr::GetDefaultGraveYard(uint32 team)
@@ -5881,7 +5824,6 @@ void ObjectMgr::LoadAreaTriggerTeleports()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 area trigger teleport definitions. DB table `areatrigger_teleport` is empty.");
-
         return;
     }
 
@@ -5928,7 +5870,6 @@ void ObjectMgr::LoadAreaTriggerTeleports()
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u area trigger teleport definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadAccessRequirements()
@@ -5942,7 +5883,6 @@ void ObjectMgr::LoadAccessRequirements()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 access requirement definitions. DB table `access_requirement` is empty.");
-
         return;
     }
 
@@ -6020,7 +5960,6 @@ void ObjectMgr::LoadAccessRequirements()
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u access requirement definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 /*
@@ -6249,7 +6188,6 @@ void ObjectMgr::LoadGameObjectLocales()
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %lu gameobject locale strings in %u ms", (unsigned long)_gameObjectLocaleStore.size(), GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 inline void CheckGOLockId(GameObjectTemplate const* goInfo, uint32 dataN, uint32 N)
@@ -6328,7 +6266,6 @@ void ObjectMgr::LoadGameObjectTemplate()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 gameobject definitions. DB table `gameobject_template` is empty.");
-
         return;
     }
 
@@ -6499,7 +6436,6 @@ void ObjectMgr::LoadGameObjectTemplate()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u game object templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadExplorationBaseXP()
@@ -6528,7 +6464,6 @@ void ObjectMgr::LoadExplorationBaseXP()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u BaseXP definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 uint32 ObjectMgr::GetBaseXP(uint8 level)
@@ -6552,7 +6487,6 @@ void ObjectMgr::LoadPetNames()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 pet name parts. DB table `pet_name_generation` is empty!");
-
         return;
     }
 
@@ -6573,7 +6507,6 @@ void ObjectMgr::LoadPetNames()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u pet name parts in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadPetNumber()
@@ -6588,7 +6521,6 @@ void ObjectMgr::LoadPetNumber()
     }
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded the max pet number: %d in %u ms", _hiPetNumber-1, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 std::string ObjectMgr::GeneratePetName(uint32 entry)
@@ -6630,7 +6562,6 @@ void ObjectMgr::LoadCorpses()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 corpses. DB table `corpse` is empty.");
-
         return;
     }
 
@@ -6659,7 +6590,6 @@ void ObjectMgr::LoadCorpses()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u corpses in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadReputationRewardRate()
@@ -6722,7 +6652,6 @@ void ObjectMgr::LoadReputationRewardRate()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u reputation_reward_rate in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadReputationOnKill()
@@ -6796,7 +6725,6 @@ void ObjectMgr::LoadReputationOnKill()
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u creature award reputation definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadReputationSpilloverTemplate()
@@ -6811,7 +6739,6 @@ void ObjectMgr::LoadReputationSpilloverTemplate()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded `reputation_spillover_template`, table is empty.");
-
         return;
     }
 
@@ -6917,7 +6844,6 @@ void ObjectMgr::LoadReputationSpilloverTemplate()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u reputation_spillover_template in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadPointsOfInterest()
@@ -6964,7 +6890,6 @@ void ObjectMgr::LoadPointsOfInterest()
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u Points of Interest definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadQuestPOI()
@@ -7036,7 +6961,6 @@ void ObjectMgr::LoadQuestPOI()
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u quest POI definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadNPCSpellClickSpells()
@@ -7104,7 +7028,6 @@ void ObjectMgr::LoadNPCSpellClickSpells()
     }
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u spellclick definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::DeleteCreatureData(uint32 guid)
@@ -7183,7 +7106,6 @@ void ObjectMgr::LoadQuestRelationsHelper(QuestRelations& map, std::string table,
     } while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u quest relations from %s in %u ms", count, table.c_str(), GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadGameobjectQuestRelations()
@@ -7253,7 +7175,6 @@ void ObjectMgr::LoadReservedPlayersNames()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 reserved player names. DB table `reserved_name` is empty!");
-
         return;
     }
 
@@ -7280,7 +7201,6 @@ void ObjectMgr::LoadReservedPlayersNames()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u reserved player names in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 bool ObjectMgr::IsReservedName(const std::string& name) const
@@ -7434,7 +7354,6 @@ void ObjectMgr::LoadGameObjectForQuests()
     if (sObjectMgr->GetGameObjectTemplates()->empty())
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 GameObjects for quests");
-
         return;
     }
 
@@ -7483,7 +7402,6 @@ void ObjectMgr::LoadGameObjectForQuests()
     }
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u GameObjects for quests in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 bool ObjectMgr::LoadTrinityStrings(const char* table, int32 min_value, int32 max_value)
@@ -7575,7 +7493,6 @@ bool ObjectMgr::LoadTrinityStrings(const char* table, int32 min_value, int32 max
     else
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u string templates from %s in %u ms", count, table, GetMSTimeDiffToNow(oldMSTime));
 
-
     return true;
 }
 
@@ -7632,7 +7549,6 @@ void ObjectMgr::LoadFishingBaseSkillLevel()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u areas for fishing base skill level in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 bool ObjectMgr::CheckDeclinedNames(std::wstring w_ownname, DeclinedName const& names)
@@ -7758,7 +7674,6 @@ void ObjectMgr::LoadGameTele()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u GameTeleports in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 GameTele const* ObjectMgr::GetGameTele(const std::string& name) const
@@ -7903,7 +7818,6 @@ void ObjectMgr::LoadMailLevelRewards()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u level dependent mail rewards in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::AddSpellToTrainer(uint32 entry, uint32 spell, uint32 spellCost, uint32 reqSkill, uint32 reqSkillValue, uint32 reqLevel)
@@ -8024,7 +7938,6 @@ void ObjectMgr::LoadTrainerSpell()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %d Trainers in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 int ObjectMgr::LoadReferenceVendor(int32 vendor, int32 item, uint8 type, std::set<uint32> *skip_vendors)
@@ -8118,7 +8031,6 @@ void ObjectMgr::LoadVendors()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %d Vendors in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadGossipMenu()
@@ -8160,7 +8072,6 @@ void ObjectMgr::LoadGossipMenu()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u gossip_menu entries in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadGossipMenuItems()
@@ -8224,7 +8135,6 @@ void ObjectMgr::LoadGossipMenuItems()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u gossip_menu_option entries in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::AddVendorItem(uint32 entry, uint32 item, int32 maxcount, uint32 incrtime, uint32 extendedCost, uint8 type, bool persist /*= true*/)
@@ -8409,7 +8319,6 @@ void ObjectMgr::LoadScriptNames()
 
     std::sort(_scriptNamesStore.begin(), _scriptNamesStore.end());
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %d Script Names in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 uint32 ObjectMgr::GetScriptId(const char *name)
@@ -8513,7 +8422,6 @@ void ObjectMgr::LoadCreatureClassLevelStats()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 creature base stats. DB table `creature_classlevelstats` is empty.");
-
         return;
     }
 
@@ -8562,7 +8470,6 @@ void ObjectMgr::LoadCreatureClassLevelStats()
     }
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u creature base stats in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadFactionChangeAchievements()
@@ -8599,7 +8506,6 @@ void ObjectMgr::LoadFactionChangeAchievements()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u faction change achievement pairs in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadFactionChangeItems()
@@ -8611,7 +8517,6 @@ void ObjectMgr::LoadFactionChangeItems()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 faction change item pairs. DB table `player_factionchange_items` is empty.");
-
         return;
     }
 
@@ -8636,7 +8541,6 @@ void ObjectMgr::LoadFactionChangeItems()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u faction change item pairs in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadFactionChangeSpells()
@@ -8673,7 +8577,6 @@ void ObjectMgr::LoadFactionChangeSpells()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u faction change spell pairs in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadFactionChangeReputations()
@@ -8685,7 +8588,6 @@ void ObjectMgr::LoadFactionChangeReputations()
     if (!result)
     {
         sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 faction change reputation pairs. DB table `player_factionchange_reputations` is empty.");
-
         return;
     }
 
@@ -8710,7 +8612,6 @@ void ObjectMgr::LoadFactionChangeReputations()
     while (result->NextRow());
 
     sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u faction change reputation pairs in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
 }
 
 void ObjectMgr::LoadHotfixData()