Merge branch 'master' into master

This commit is contained in:
Yehonal
2017-08-20 04:59:52 +02:00
committed by GitHub
152 changed files with 9631 additions and 4899 deletions

View File

@@ -1510,7 +1510,9 @@ public:
if (!playerTarget)
playerTarget = player;
;//sLog->outDetail(handler->GetTrinityString(LANG_ADDITEM), itemId, count);
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
sLog->outDetail(handler->GetTrinityString(LANG_ADDITEM), itemId, count);
#endif
ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(itemId);
if (!itemTemplate)
@@ -1597,7 +1599,9 @@ public:
if (!playerTarget)
playerTarget = player;
;//sLog->outDetail(handler->GetTrinityString(LANG_ADDITEMSET), itemSetId);
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
sLog->outDetail(handler->GetTrinityString(LANG_ADDITEMSET), itemSetId);
#endif
bool found = false;
ItemTemplateContainer const* its = sObjectMgr->GetItemTemplateStore();