Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw
Conflicts: src/server/collision/Management/MMapManager.cpp src/server/game/Maps/Map.cpp src/server/game/Movement/PathGenerator.cpp
This commit is contained in:
commit
8658b5338c
591 files changed
+76673
-15320
No files matched your search
@@ -1110,7 +1110,7 @@ public:
|
||||
if (!playerTarget)
|
||||
playerTarget = player;
|
||||
|
||||
TC_LOG_DEBUG(LOG_FILTER_GENERAL, handler->GetTrinityString(LANG_ADDITEM), itemId, count);
|
||||
TC_LOG_DEBUG("misc", handler->GetTrinityString(LANG_ADDITEM), itemId, count);
|
||||
|
||||
ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(itemId);
|
||||
if (!itemTemplate)
|
||||
@@ -1189,7 +1189,7 @@ public:
|
||||
if (!playerTarget)
|
||||
playerTarget = player;
|
||||
|
||||
TC_LOG_DEBUG(LOG_FILTER_GENERAL, handler->GetTrinityString(LANG_ADDITEMSET), itemSetId);
|
||||
TC_LOG_DEBUG("misc", handler->GetTrinityString(LANG_ADDITEMSET), itemSetId);
|
||||
|
||||
bool found = false;
|
||||
ItemTemplateContainer const* its = sObjectMgr->GetItemTemplateStore();
|
||||
|
||||
Reference in new issue
Block a user