diff options
| author | Dastgir <dastgirp@gmail.com> | 2017-12-18 19:06:46 +0530 |
|---|---|---|
| committer | Dastgir <dastgirp@gmail.com> | 2017-12-18 19:06:46 +0530 |
| commit | d3a2983a04084ea549c928c094c65eade3b10aa5 (patch) | |
| tree | 6b0f3b0c2a5a9db6cd540692868f986363ec7768 | |
| parent | 99c34eb5637fc48eba2998e304697b96ad6e89bf (diff) | |
| download | hercules-d3a2983a04084ea549c928c094c65eade3b10aa5.tar.gz hercules-d3a2983a04084ea549c928c094c65eade3b10aa5.tar.bz2 hercules-d3a2983a04084ea549c928c094c65eade3b10aa5.tar.xz hercules-d3a2983a04084ea549c928c094c65eade3b10aa5.zip | |
RoDEX Update:
* Will not open if NPC is attached.
* Will not send mail if NPC is attached.
Fixes #1934
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/rodex.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 7edc1ec5a..17faf02c8 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -19310,7 +19310,7 @@ void clif_parse_rodex_open_write_mail(int fd, struct map_session_data *sd) __att void clif_parse_rodex_open_write_mail(int fd, struct map_session_data *sd) { const struct PACKET_CZ_REQ_OPEN_WRITE_MAIL *rPacket = RFIFOP(fd, 0); - int8 result = (rodex->isenabled() == true) ? 1 : 0; + int8 result = (rodex->isenabled() == true && sd->npc_id == 0) ? 1 : 0; clif->rodex_open_write_mail(fd, rPacket->receiveName, result); } diff --git a/src/map/rodex.c b/src/map/rodex.c index dcecb6b8f..02e757a10 100644 --- a/src/map/rodex.c +++ b/src/map/rodex.c @@ -231,6 +231,11 @@ int rodex_send_mail(struct map_session_data *sd, const char *receiver_name, cons nullpo_retr(RODEX_SEND_MAIL_FATAL_ERROR, body); nullpo_retr(RODEX_SEND_MAIL_FATAL_ERROR, title); + if (!rodex->isenabled() || sd->npc_id > 0) { + rodex->clean(sd, 1); + return RODEX_SEND_MAIL_FATAL_ERROR; + } + if (zeny < 0) { rodex->clean(sd, 1); return RODEX_SEND_MAIL_FATAL_ERROR; |