diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-11-22 09:09:01 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-11-22 09:09:01 +0000 |
| commit | 220eb19293c057036c162da9bd0b7a7cd4e0a986 (patch) | |
| tree | bc1a9c44e8503b3dee23435b1889a805cb1eb5b6 | |
| parent | 39253de1b1335b0c9f71d5bc31c1a6b5a95f6940 (diff) | |
| download | hercules-220eb19293c057036c162da9bd0b7a7cd4e0a986.tar.gz hercules-220eb19293c057036c162da9bd0b7a7cd4e0a986.tar.bz2 hercules-220eb19293c057036c162da9bd0b7a7cd4e0a986.tar.xz hercules-220eb19293c057036c162da9bd0b7a7cd4e0a986.zip | |
* mail_deliveryfail no longer attempts to log (since r12910) and give items (since r11855), when there is no item attached to the mail (bugreport:3239).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14482 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/mail.c | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 1fa18948f..2286d261a 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,5 +1,7 @@ Date Added +2010/11/22 + * mail_deliveryfail no longer attempts to log (since r12910) and give items (since r11855), when there is no item attached to the mail (bugreport:3239). [Ai4rei] 2010/11/21 * Added msinttypes (rev. 26, http://msinttypes.googlecode.com/svn/trunk/) portability framework for Visual C++ compilers (related bugreport:4059). [Ai4rei] * Added 64-bit variants of the socket and buffer I/O macros. [Ai4rei] diff --git a/src/map/mail.c b/src/map/mail.c index c79381c66..f0869185a 100644 --- a/src/map/mail.c +++ b/src/map/mail.c @@ -175,12 +175,15 @@ void mail_deliveryfail(struct map_session_data *sd, struct mail_message *msg) nullpo_retv(sd); nullpo_retv(msg); - // Item recieve (due to failure) - if(log_config.enable_logs&0x2000) - log_pick_pc(sd, "E", msg->item.nameid, msg->item.amount, &msg->item); + if( msg->item.amount > 0 ) + { + // Item recieve (due to failure) + if(log_config.enable_logs&0x2000) + log_pick_pc(sd, "E", msg->item.nameid, msg->item.amount, &msg->item); + + pc_additem(sd, &msg->item, msg->item.amount); + } - pc_additem(sd, &msg->item, msg->item.amount); - if( msg->zeny > 0 ) { //Zeny recieve (due to failure) |