Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Misc: Added new error logs for gameobject_questitem / creature_questitem tables

Browse Source 
(cherry picked from commit 2fcab335df301a98269e427c955418fd98c3fd86)
This commit is contained in:
Vincent-Michael authored and DDuarte committed 2015-07-26 01:21:13 +01:00
1 parent 4476f6c867
commit fd26c3c87c
1 file changed
+36 -6
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Globals/ObjectMgr.cpp
+36 -6
View File
@@ -9141,8 +9141,8 @@ void ObjectMgr::LoadGameObjectQuestItems()
{ {
uint32 oldMSTime = getMSTime(); uint32 oldMSTime = getMSTime();
// 0 1 // 0 1 2
QueryResult result = WorldDatabase.Query("SELECT GameObjectEntry, ItemId FROM gameobject_questitem ORDER BY Idx ASC"); QueryResult result = WorldDatabase.Query("SELECT GameObjectEntry, ItemId, Idx FROM gameobject_questitem ORDER BY Idx ASC");
if (!result) if (!result)
{ {
@@ -9156,7 +9156,22 @@ void ObjectMgr::LoadGameObjectQuestItems()
Field* fields = result->Fetch(); Field* fields = result->Fetch();
uint32 entry = fields[0].GetUInt32(); uint32 entry = fields[0].GetUInt32();
uint32 item = fields[1].GetUInt32(); uint32 item = fields[1].GetUInt32();
uint32 idx = fields[2].GetUInt32();
GameObjectTemplate const* goInfo = GetGameObjectTemplate(entry);
if (!goInfo)
{
TC_LOG_ERROR("sql.sql", "Table `gameobject_questitem` has data for nonexistent gameobject (entry: %u, idx: %u), skipped", entry, idx);
continue;
};
ItemEntry const* db2Data = sItemStore.LookupEntry(item);
if (!db2Data)
{
TC_LOG_ERROR("sql.sql", "Table `gameobject_questitem` has nonexistent item (ID: %u) in gameobject (entry: %u, idx: %u), skipped", item, entry, idx);
continue;
};
_gameObjectQuestItemStore[entry].push_back(item); _gameObjectQuestItemStore[entry].push_back(item);
@@ -9171,8 +9186,8 @@ void ObjectMgr::LoadCreatureQuestItems()
{ {
uint32 oldMSTime = getMSTime(); uint32 oldMSTime = getMSTime();
// 0 1 // 0 1 2
QueryResult result = WorldDatabase.Query("SELECT CreatureEntry, ItemId FROM creature_questitem ORDER BY Idx ASC"); QueryResult result = WorldDatabase.Query("SELECT CreatureEntry, ItemId, Idx FROM creature_questitem ORDER BY Idx ASC");
if (!result) if (!result)
{ {
@@ -9186,7 +9201,22 @@ void ObjectMgr::LoadCreatureQuestItems()
Field* fields = result->Fetch(); Field* fields = result->Fetch();
uint32 entry = fields[0].GetUInt32(); uint32 entry = fields[0].GetUInt32();
uint32 item = fields[1].GetUInt32(); uint32 item = fields[1].GetUInt32();
uint32 idx = fields[2].GetUInt32();
CreatureTemplate const* creatureInfo = GetCreatureTemplate(entry);
if (!creatureInfo)
{
TC_LOG_ERROR("sql.sql", "Table `creature_questitem` has data for nonexistent creature (entry: %u, idx: %u), skipped", entry, idx);
continue;
};
ItemEntry const* db2Data = sItemStore.LookupEntry(item);
if (!db2Data)
{
TC_LOG_ERROR("sql.sql", "Table `creature_questitem` has nonexistent item (ID: %u) in creature (entry: %u, idx: %u), skipped", item, entry, idx);
continue;
};
_creatureQuestItemStore[entry].push_back(item); _creatureQuestItemStore[entry].push_back(item);