summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKenpachi Developer <Kenpachi.Developer@gmx.de>2020-06-25 08:17:06 +0200
committerKenpachi Developer <Kenpachi.Developer@gmx.de>2020-06-25 08:17:06 +0200
commit87994df22212939fb9151160015953daccc289b6 (patch)
treeb98dd973059f01cf95ece3b846312b451ec3a3a2 /src
parentcc2dcda6c77936634cec00a56649c2898cafd4f1 (diff)
downloadhercules-87994df22212939fb9151160015953daccc289b6.tar.gz
hercules-87994df22212939fb9151160015953daccc289b6.tar.bz2
hercules-87994df22212939fb9151160015953daccc289b6.tar.xz
hercules-87994df22212939fb9151160015953daccc289b6.zip
Enable resurrection by Token of Siegfried while Megaphone input box is present
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index b0c8fe027..f347a379a 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -16762,7 +16762,7 @@ static void clif_parse_AutoRevive(int fd, struct map_session_data *sd) __attribu
/// 0292
static void clif_parse_AutoRevive(int fd, struct map_session_data *sd)
{
- if (pc_istrading(sd) || pc_isvending(sd))
+ if (pc_istrading_except_npc(sd) || (sd->npc_id != 0 && sd->state.using_megaphone == 0) || pc_isvending(sd))
return;
if (!pc_isdead(sd))