Added mail zeny loss prevention, bugreport:2919

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15310 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2011-12-29 15:04:14 +00:00
parent 684c57b378
commit 7627f2522e
2 changed files with 5 additions and 1 deletions

View File

@ -13032,6 +13032,9 @@ void clif_parse_Mail_getattach(int fd, struct map_session_data *sd)
if( sd->mail.inbox.msg[i].zeny < 1 && (sd->mail.inbox.msg[i].item.nameid < 1 || sd->mail.inbox.msg[i].item.amount < 1) ) if( sd->mail.inbox.msg[i].zeny < 1 && (sd->mail.inbox.msg[i].item.nameid < 1 || sd->mail.inbox.msg[i].item.amount < 1) )
return; return;
if( ( sd->mail.inbox.msg[i].zeny + sd->mail.inbox.msg[i].zeny ) > MAX_ZENY )
return;
if( sd->mail.inbox.msg[i].item.nameid > 0 ) if( sd->mail.inbox.msg[i].item.nameid > 0 )
{ {
struct item_data *data; struct item_data *data;

View File

@ -52,7 +52,8 @@ int mail_removeitem(struct map_session_data *sd, short flag)
int mail_removezeny(struct map_session_data *sd, short flag) int mail_removezeny(struct map_session_data *sd, short flag)
{ {
nullpo_ret(sd); nullpo_ret(sd);
if( ( sd->status.zeny + sd->mail.zeny ) > MAX_ZENY )
return 1;
if (flag && sd->mail.zeny > 0) if (flag && sd->mail.zeny > 0)
{ //Zeny send { //Zeny send
log_zeny(sd, LOG_TYPE_MAIL, sd, -sd->mail.zeny); log_zeny(sd, LOG_TYPE_MAIL, sd, -sd->mail.zeny);