nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-26 07:06:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Yehonal
2017-08-20 04:59:52 +02:00
committed by GitHub
parent fa147d84d2 0dd68dfbee
commit c854b65882
152 changed files with 9631 additions and 4899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/scripts/Commands/cs_misc.cpp
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();

12
src/scripts/Commands/cs_modify.cpp
View File

@@ -190,7 +190,9 @@ public:
target->SetMaxPower(POWER_ENERGY, energym);
target->SetPower(POWER_ENERGY, energy);
;//sLog->outDetail(handler->GetTrinityString(LANG_CURRENT_ENERGY), target->GetMaxPower(POWER_ENERGY));
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
sLog->outDetail(handler->GetTrinityString(LANG_CURRENT_ENERGY), target->GetMaxPower(POWER_ENERGY));
#endif
return true;
}
@@ -1016,7 +1018,9 @@ public:
{
int32 newmoney = int32(targetMoney) + moneyToAdd;
;//sLog->outDebug(LOG_FILTER_GENERAL, handler->GetTrinityString(LANG_CURRENT_MONEY), targetMoney, moneyToAdd, newmoney);
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
sLog->outDebug(LOG_FILTER_CHATSYS, handler->GetTrinityString(LANG_CURRENT_MONEY), targetMoney, moneyToAdd, newmoney);
#endif
if (newmoney <= 0)
{
handler->PSendSysMessage(LANG_YOU_TAKE_ALL_MONEY, handler->GetNameLink(target).c_str());
@@ -1051,7 +1055,9 @@ public:
target->ModifyMoney(moneyToAdd);
}
;//sLog->outDebug(LOG_FILTER_GENERAL, handler->GetTrinityString(LANG_NEW_MONEY), targetMoney, moneyToAdd, target->GetMoney());
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
sLog->outDebug(LOG_FILTER_CHATSYS, handler->GetTrinityString(LANG_NEW_MONEY), targetMoney, moneyToAdd, target->GetMoney());
#endif
return true;
}

2
src/scripts/Commands/cs_wp.cpp
View File

@@ -783,7 +783,7 @@ public:
if (show == "info")
{
// Check if the user did specify a visual waypoint
if (target && target->GetEntry() != VISUAL_WAYPOINT)
if (!target || target->GetEntry() != VISUAL_WAYPOINT)
{
handler->PSendSysMessage(LANG_WAYPOINT_VP_SELECT);
handler->SetSentErrorMessage(true);