summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2018-03-11 15:39:42 +0100
committerGitHub <noreply@github.com>2018-03-11 15:39:42 +0100
commitcd56f7302cfe7c64e5a2e15ed2f0bed745d03b9e (patch)
treeb54690050afa974c6834636727900a76a34bd238 /src/map
parentf7ca209c044d4c08e932beac8580ddc2c2d7a924 (diff)
parentd3a2983a04084ea549c928c094c65eade3b10aa5 (diff)
downloadhercules-cd56f7302cfe7c64e5a2e15ed2f0bed745d03b9e.tar.gz
hercules-cd56f7302cfe7c64e5a2e15ed2f0bed745d03b9e.tar.bz2
hercules-cd56f7302cfe7c64e5a2e15ed2f0bed745d03b9e.tar.xz
hercules-cd56f7302cfe7c64e5a2e15ed2f0bed745d03b9e.zip
Merge pull request #1936 from dastgir/2017-3_rodex
RoDEX Update
Diffstat (limited to 'src/map')
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/rodex.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 546247c3c..4f98d2c9c 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -19621,7 +19621,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 8626f76e1..0e9e4ee2a 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;