1 files changed, 11 insertions, 195 deletions

diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 43381267545..71ce341185e 100755
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -461,7 +461,7 @@ void ObjectMgr::LoadCreatureTemplates()
         creatureTemplate.SkinLootId        = fields[48].GetUInt32();
 
         for (uint8 i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i)
-            creatureTemplate.resistance[i] = fields[50 + i -1].GetInt16();
+            creatureTemplate.resistance[i] = fields[49 + i - 1].GetInt16();
 
         for (uint8 i = 0; i < CREATURE_MAX_SPELLS; ++i)
             creatureTemplate.spells[i] = fields[55 + i].GetUInt32();
@@ -1884,71 +1884,6 @@ void ObjectMgr::RemoveGameobjectFromGrid(uint32 guid, GameObjectData const* data
     }
 }
 
-void ObjectMgr::LoadCreatureRespawnTimes()
-{
-    uint32 oldMSTime = getMSTime();
-
-    uint32 count = 0;
-
-    PreparedQueryResult result = CharacterDatabase.Query(CharacterDatabase.GetPreparedStatement(CHAR_SEL_CREATURE_RESPAWNS));
-    if (!result)
-    {
-        sLog->outString(">> Loaded 0 creature respawn time.");
-        sLog->outString();
-        return;
-    }
-
-    do
-    {
-        Field* fields = result->Fetch();
-
-        uint32 loguid       = fields[0].GetUInt32();
-        uint32 respawn_time = fields[1].GetUInt32();
-        uint32 instance     = fields[2].GetUInt32();
-
-        _creatureRespawnTimes[MAKE_PAIR64(loguid, instance)] = time_t(respawn_time);
-
-        ++count;
-    } while (result->NextRow());
-
-    sLog->outString(">> Loaded %lu creature respawn times in %u ms", (unsigned long)_creatureRespawnTimes.size(), GetMSTimeDiffToNow(oldMSTime));
-    sLog->outString();
-}
-
-void ObjectMgr::LoadGameobjectRespawnTimes()
-{
-    uint32 oldMSTime = getMSTime();
-
-    // Remove outdated data
-    CharacterDatabase.DirectExecute("DELETE FROM gameobject_respawn WHERE respawnTime <= UNIX_TIMESTAMP(NOW())");
-
-    uint32 count = 0;
-
-    PreparedQueryResult result = CharacterDatabase.Query(CharacterDatabase.GetPreparedStatement(CHAR_SEL_GO_RESPAWNS));
-    if (!result)
-    {
-        sLog->outString(">> Loaded 0 gameobject respawn times. DB table `gameobject_respawn` is empty!");
-        sLog->outString();
-        return;
-    }
-
-    do
-    {
-        Field* fields = result->Fetch();
-
-        uint32 loguid       = fields[0].GetUInt32();
-        uint32 respawn_time = fields[1].GetUInt32();
-        uint32 instance     = fields[2].GetUInt32();
-
-        _goRespawnTimes[MAKE_PAIR64(loguid, instance)] = time_t(respawn_time);
-
-        ++count;
-    } while (result->NextRow());
-
-    sLog->outString();
-    sLog->outString(">> Loaded %lu gameobject respawn times in %u ms", (unsigned long)_goRespawnTimes.size(), GetMSTimeDiffToNow(oldMSTime));
-}
-
 Player* ObjectMgr::GetPlayerByLowGUID(uint32 lowguid) const
 {
     uint64 guid = MAKE_NEW_GUID(lowguid, 0, HIGHGUID_PLAYER);
@@ -2613,7 +2548,7 @@ void ObjectMgr::LoadItemTemplateAddon()
     uint32 oldMSTime = getMSTime();
     uint32 count = 0;
 
-    QueryResult result = WorldDatabase.Query("SELECT Id, FoodType, MinMoneyLoot, MaxMoneyLoot, SpellPPMChance FROM item_template_addon");
+    QueryResult result = WorldDatabase.Query("SELECT Id, FlagsCu, FoodType, MinMoneyLoot, MaxMoneyLoot, SpellPPMChance FROM item_template_addon");
     if (result)
     {
         do
@@ -2626,16 +2561,8 @@ void ObjectMgr::LoadItemTemplateAddon()
                 continue;
             }
 
-            uint8 buyCount = fields[1].GetUInt8();
-            if (!buyCount)
-            {
-                sLog->outErrorDb("Item %u has BuyCount set to 0, corrected to 1.", itemId);
-                buyCount = 1;
-            }
-
-            uint8 foodType = fields[1].GetUInt8();
-            uint32 minMoneyLoot = fields[2].GetUInt32();
-            uint32 maxMoneyLoot = fields[3].GetUInt32();
+            uint32 minMoneyLoot = fields[3].GetUInt32();
+            uint32 maxMoneyLoot = fields[4].GetUInt32();
             if (minMoneyLoot > maxMoneyLoot)
             {
                 sLog->outErrorDb("Minimum money loot specified in `item_template_addon` for item %u was greater than maximum amount, swapping.", itemId);
@@ -2643,10 +2570,11 @@ void ObjectMgr::LoadItemTemplateAddon()
             }
 
             ItemTemplate& itemTemplate = _itemTemplateStore[itemId];
-            itemTemplate.FoodType = foodType;
+            itemTemplate.FlagsCu = fields[1].GetUInt32();
+            itemTemplate.FoodType = fields[2].GetUInt8();
             itemTemplate.MinMoneyLoot = minMoneyLoot;
             itemTemplate.MaxMoneyLoot = maxMoneyLoot;
-            itemTemplate.SpellPPMRate = fields[4].GetFloat();
+            itemTemplate.SpellPPMRate = fields[5].GetFloat();
             ++count;
         } while (result->NextRow());
     }
@@ -2739,6 +2667,7 @@ void ObjectMgr::LoadItemSetNames()
     }
 
     //                                                  0        1            2
+    //                                                  0        1            2
     QueryResult result = WorldDatabase.Query("SELECT `entry`, `name`, `InventoryType` FROM `item_set_names`");
 
     if (!result)
@@ -5043,11 +4972,11 @@ void ObjectMgr::LoadSpellScriptNames()
 
         Field* fields = result->Fetch();
 
-        int32 spellId         = fields[0].GetInt32();
+        int32 spellId          = fields[0].GetInt32();
         const char *scriptName = fields[1].GetCString();
 
         bool allRanks = false;
-        if (spellId <=0)
+        if (spellId <= 0)
         {
             allRanks = true;
             spellId = -spellId;
@@ -6783,7 +6712,7 @@ uint32 ObjectMgr::GetBaseXP(uint8 level)
     return _baseXPTable[level] ? _baseXPTable[level] : 0;
 }
 
-uint32 ObjectMgr::GetXPForLevel(uint8 level)
+uint32 ObjectMgr::GetXPForLevel(uint8 level) const
 {
     if (level < _playerXPperLevel.size())
         return _playerXPperLevel[level];
@@ -7340,44 +7269,6 @@ void ObjectMgr::LoadNPCSpellClickSpells()
     sLog->outString();
 }
 
-void ObjectMgr::SaveCreatureRespawnTime(uint32 loguid, uint32 instance, time_t t)
-{
-    if (!t)
-    {
-        // Delete only
-        RemoveCreatureRespawnTime(loguid, instance);
-        return;
-    }
-
-    // This function can be called from various map threads concurrently
-    {
-        _creatureRespawnTimesMutex.acquire();
-        _creatureRespawnTimes[MAKE_PAIR64(loguid, instance)] = t;
-        _creatureRespawnTimesMutex.release();
-    }
-
-    PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_REP_CREATURE_RESPAWN);
-    stmt->setUInt32(0, loguid);
-    stmt->setUInt32(1, uint32(t));
-    stmt->setUInt32(2, instance);
-    CharacterDatabase.Execute(stmt);
-}
-
-void ObjectMgr::RemoveCreatureRespawnTime(uint32 loguid, uint32 instance)
-{
-    // This function can be called from various map threads concurrently
-    {
-        _creatureRespawnTimesMutex.acquire();
-        _creatureRespawnTimes[MAKE_PAIR64(loguid, instance)] = 0;
-        _creatureRespawnTimesMutex.release();
-    }
-
-    PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CREATURE_RESPAWN);
-    stmt->setUInt32(0, loguid);
-    stmt->setUInt32(1, instance);
-    CharacterDatabase.Execute(stmt);
-}
-
 void ObjectMgr::DeleteCreatureData(uint32 guid)
 {
     // remove mapid*cellid -> guid_set map
@@ -7388,81 +7279,6 @@ void ObjectMgr::DeleteCreatureData(uint32 guid)
     _creatureDataStore.erase(guid);
 }
 
-void ObjectMgr::SaveGORespawnTime(uint32 loguid, uint32 instance, time_t t)
-{
-    if (!t)
-    {
-        // Delete only
-        RemoveGORespawnTime(loguid, instance);
-        return;
-    }
-
-    // This function can be called from different map threads concurrently
-    {
-        _goRespawnTimesMutex.acquire();
-        _goRespawnTimes[MAKE_PAIR64(loguid, instance)] = t;
-        _goRespawnTimesMutex.release();
-    }
-
-    PreparedStatement *stmt = CharacterDatabase.GetPreparedStatement(CHAR_REP_GO_RESPAWN);
-    stmt->setUInt32(0, loguid);
-    stmt->setUInt64(1, uint64(t));
-    stmt->setUInt32(2, instance);
-    CharacterDatabase.Execute(stmt);
-}
-
-void ObjectMgr::RemoveGORespawnTime(uint32 loguid, uint32 instance)
-{
-    // This function can be called from different map threads concurrently
-    {
-        _goRespawnTimesMutex.acquire();
-        _goRespawnTimes[MAKE_PAIR64(loguid, instance)] = 0;
-        _goRespawnTimesMutex.release();
-    }
-
-    PreparedStatement *stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GO_RESPAWN);
-    stmt->setUInt32(0, loguid);
-    stmt->setUInt32(1, instance);
-    CharacterDatabase.Execute(stmt);
-}
-
-void ObjectMgr::DeleteRespawnTimeForInstance(uint32 instance)
-{
-    // This function can be called from different map threads concurrently
-    RespawnTimes::iterator next;
-
-    {
-        _goRespawnTimesMutex.acquire();
-        for (RespawnTimes::iterator itr = _goRespawnTimes.begin(); itr != _goRespawnTimes.end(); itr = next)
-        {
-            next = itr;
-            ++next;
-
-            if (GUID_HIPART(itr->first) == instance)
-                _goRespawnTimes.erase(itr);
-        }
-        _goRespawnTimesMutex.release();
-    }
-    {
-        _creatureRespawnTimesMutex.acquire();
-        for (RespawnTimes::iterator itr = _creatureRespawnTimes.begin(); itr != _creatureRespawnTimes.end(); itr = next)
-        {
-            next = itr;
-            ++next;
-
-            if (GUID_HIPART(itr->first) == instance)
-                _creatureRespawnTimes.erase(itr);
-        }
-        _creatureRespawnTimesMutex.release();
-    }
-    PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CREATURE_RESPAWN_BY_INSTANCE);
-    stmt->setUInt32(0, instance);
-    CharacterDatabase.Execute(stmt);
-    stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GO_RESPAWN_BY_INSTANCE);
-    stmt->setUInt32(0, instance);
-    CharacterDatabase.Execute(stmt);
-}
-
 void ObjectMgr::DeleteGOData(uint32 guid)
 {
     // remove mapid*cellid -> guid_set map