[7803] Prevent ignore max money limit at use .modify money command. Author: VladimirMangos
--HG-- branch : trunk
This commit is contained in:
+8
-1
@@ -2093,7 +2093,7 @@ bool ChatHandler::HandleModifyMoneyCommand(const char* args)
|
|||||||
|
|
||||||
if (addmoney < 0)
|
if (addmoney < 0)
|
||||||
{
|
{
|
||||||
int32 newmoney = moneyuser + addmoney;
|
int32 newmoney = int32(moneyuser) + addmoney;
|
||||||
|
|
||||||
sLog.outDetail(GetTrinityString(LANG_CURRENT_MONEY), moneyuser, addmoney, newmoney);
|
sLog.outDetail(GetTrinityString(LANG_CURRENT_MONEY), moneyuser, addmoney, newmoney);
|
||||||
if (newmoney <= 0 )
|
if (newmoney <= 0 )
|
||||||
@@ -2106,6 +2106,9 @@ bool ChatHandler::HandleModifyMoneyCommand(const char* args)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
if (newmoney > MAX_MONEY_AMOUNT)
|
||||||
|
newmoney = MAX_MONEY_AMOUNT;
|
||||||
|
|
||||||
PSendSysMessage(LANG_YOU_TAKE_MONEY, abs(addmoney), GetNameLink(chr).c_str());
|
PSendSysMessage(LANG_YOU_TAKE_MONEY, abs(addmoney), GetNameLink(chr).c_str());
|
||||||
if (needReportToTarget(chr))
|
if (needReportToTarget(chr))
|
||||||
ChatHandler(chr).PSendSysMessage(LANG_YOURS_MONEY_TAKEN, GetNameLink().c_str(), abs(addmoney));
|
ChatHandler(chr).PSendSysMessage(LANG_YOURS_MONEY_TAKEN, GetNameLink().c_str(), abs(addmoney));
|
||||||
@@ -2117,6 +2120,10 @@ bool ChatHandler::HandleModifyMoneyCommand(const char* args)
|
|||||||
PSendSysMessage(LANG_YOU_GIVE_MONEY, addmoney, GetNameLink(chr).c_str());
|
PSendSysMessage(LANG_YOU_GIVE_MONEY, addmoney, GetNameLink(chr).c_str());
|
||||||
if (needReportToTarget(chr))
|
if (needReportToTarget(chr))
|
||||||
ChatHandler(chr).PSendSysMessage(LANG_YOURS_MONEY_GIVEN, GetNameLink().c_str(), addmoney);
|
ChatHandler(chr).PSendSysMessage(LANG_YOURS_MONEY_GIVEN, GetNameLink().c_str(), addmoney);
|
||||||
|
|
||||||
|
if (addmoney >=MAX_MONEY_AMOUNT)
|
||||||
|
chr->SetMoney(MAX_MONEY_AMOUNT);
|
||||||
|
else
|
||||||
chr->ModifyMoney( addmoney );
|
chr->ModifyMoney( addmoney );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user