diff options
| author | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-06-28 02:08:49 +0200 |
|---|---|---|
| committer | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-06-28 02:08:49 +0200 |
| commit | 736b288594003e1e6e4aabf8bc72f82d03143bb2 (patch) | |
| tree | 60b3936ab37d0de8557fa03b99dae77ca7cce192 /src/map | |
| parent | e7f6a8ad0baefe9827b42a01d99ce2e507bf9284 (diff) | |
| download | hercules-736b288594003e1e6e4aabf8bc72f82d03143bb2.tar.gz hercules-736b288594003e1e6e4aabf8bc72f82d03143bb2.tar.bz2 hercules-736b288594003e1e6e4aabf8bc72f82d03143bb2.tar.xz hercules-736b288594003e1e6e4aabf8bc72f82d03143bb2.zip | |
Disable using Megaphone while interacting with NPCs regardless of item_enabled_npc battle flag
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/pc.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 |