From 736b288594003e1e6e4aabf8bc72f82d03143bb2 Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Sun, 28 Jun 2020 02:08:49 +0200 Subject: Disable using Megaphone while interacting with NPCs regardless of item_enabled_npc battle flag --- src/map/pc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/map/pc.c b/src/map/pc.c index ae746dab4..6f3227ec9 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -5190,7 +5190,8 @@ static int pc_useitem(struct map_session_data *sd, int n) // Store information for later use before it is lost (via pc->delitem) [Paradox924X] nameid = sd->inventory_data[n]->nameid; - if (nameid == ITEMID_MEGAPHONE && ((sd->state.workinprogress & 2) != 0 || sd->state.using_megaphone != 0)) { + if (nameid == ITEMID_MEGAPHONE && ((sd->state.workinprogress & 2) != 0 || sd->state.using_megaphone != 0 + || sd->npc_id != 0)) { #if PACKETVER >= 20110308 clif->msgtable(sd, MSG_BUSY); #else -- cgit v1.2.3-60-g2f50