diff options
| author | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-06-25 08:14:57 +0200 |
|---|---|---|
| committer | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-06-25 08:14:57 +0200 |
| commit | 90a72bc5eaae71d2ccdd4c1b6f859afb4c336fc6 (patch) | |
| tree | 431d41816d7029bb8fbc92a1be9414e138abaa7e /src/map/mail.c | |
| parent | 1ae87bdd29223dd5983b92bbac54496e7277d98d (diff) | |
| download | hercules-90a72bc5eaae71d2ccdd4c1b6f859afb4c336fc6.tar.gz hercules-90a72bc5eaae71d2ccdd4c1b6f859afb4c336fc6.tar.bz2 hercules-90a72bc5eaae71d2ccdd4c1b6f859afb4c336fc6.tar.xz hercules-90a72bc5eaae71d2ccdd4c1b6f859afb4c336fc6.zip | |
Enable sending mails while Megaphone input box is present
Diffstat (limited to 'src/map/mail.c')
| -rw-r--r-- | src/map/mail.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/mail.c b/src/map/mail.c index a1176e8fc..b862900c7 100644 --- a/src/map/mail.c +++ b/src/map/mail.c @@ -81,9 +81,9 @@ static int mail_removezeny(struct map_session_data *sd, short flag) static unsigned char mail_setitem(struct map_session_data *sd, int idx, int amount) { - nullpo_retr(1, sd); - if( pc_istrading(sd) ) + + if (pc_istrading_except_npc(sd) || (sd->npc_id != 0 && sd->state.using_megaphone == 0)) return 1; if( idx == 0 ) { // Zeny Transfer |