From 0b3a4bf5a575421df034f3180c0efc34509c24c7 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Thu, 4 Jun 2009 04:05:43 +0400 Subject: [PATCH] [7950] Make clear in error output 2 cases of fail CMSG_ITEM_NAME_QUERY: DB absent data and not expected to exist item. --- src/game/ItemHandler.cpp | 8 +++++++- src/game/ObjectMgr.cpp | 3 --- src/shared/revision_nr.h | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/game/ItemHandler.cpp b/src/game/ItemHandler.cpp index 61c377b33..f84bba9b6 100644 --- a/src/game/ItemHandler.cpp +++ b/src/game/ItemHandler.cpp @@ -1007,7 +1007,13 @@ void WorldSession::HandleItemNameQueryOpcode(WorldPacket & recv_data) return; } else - sLog.outErrorDb("WORLD: CMSG_ITEM_NAME_QUERY for item %u failed (unknown item)", itemid); + { + // listed in dbc or not expected to exist unknown item + if(sItemStore.LookupEntry(itemid)) + sLog.outErrorDb("WORLD: CMSG_ITEM_NAME_QUERY for item %u failed (item listed in Item.dbc but not exist in DB)", itemid); + else + sLog.outError("WORLD: CMSG_ITEM_NAME_QUERY for item %u failed (unknown item, not listed in Item.dbc)", itemid); + } } void WorldSession::HandleWrapItemOpcode(WorldPacket& recv_data) diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 0f1fbdb04..219d138d5 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -813,9 +813,6 @@ void ObjectMgr::LoadEquipmentTemplates() } sLog.outString( ">> Loaded %u equipment template", sEquipmentStorage.RecordCount ); sLog.outString(); - - // Creature items can be not listed in item_template - //sItemStore.Clear(); -- so used in spell casting } CreatureModelInfo const* ObjectMgr::GetCreatureModelInfo(uint32 modelid) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index dc664f88b..399e8b46d 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7949" + #define REVISION_NR "7950" #endif // __REVISION_NR_H__