summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenpachi Developer <Kenpachi.Developer@gmx.de>2020-06-25 07:58:32 +0200
committerKenpachi Developer <Kenpachi.Developer@gmx.de>2020-06-25 07:58:32 +0200
commit7aa47a08bfdce1a6f65acaa86815b9d8a02e3a48 (patch)
tree09ad763f512ae361dc57bdcb5246a05184188233
parentbe04b21c5a00a025229dbec29e1fa8bdc7da11a8 (diff)
downloadhercules-7aa47a08bfdce1a6f65acaa86815b9d8a02e3a48.tar.gz
hercules-7aa47a08bfdce1a6f65acaa86815b9d8a02e3a48.tar.bz2
hercules-7aa47a08bfdce1a6f65acaa86815b9d8a02e3a48.tar.xz
hercules-7aa47a08bfdce1a6f65acaa86815b9d8a02e3a48.zip
Enable picking up items while Megaphone input box is present
-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 f220e0e06..db719256e 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11956,7 +11956,7 @@ static void clif_parse_TakeItem(int fd, struct map_session_data *sd)
) )
break;
- if (pc_cant_act(sd))
+ if (pc_cant_act_except_npc(sd) || (sd->npc_id != 0 && sd->state.using_megaphone == 0))
break;
if (!pc->takeitem(sd, fitem))