diff options
| author | Haru <haru@dotalux.com> | 2020-01-12 20:29:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-12 20:29:39 +0100 |
| commit | 7391e5d257587ec92b96f6ebbdc77f82072ee23d (patch) | |
| tree | 16d15357ca2073eb37eca7e02d57ea149a9c65cb /src/map/clif.c | |
| parent | 5ee3fcc3fc89304b8be221a9cb1406002ce0b0e3 (diff) | |
| parent | e6199edca8ad4eee32b7e34318f99f365d8520db (diff) | |
| download | hercules-7391e5d257587ec92b96f6ebbdc77f82072ee23d.tar.gz hercules-7391e5d257587ec92b96f6ebbdc77f82072ee23d.tar.bz2 hercules-7391e5d257587ec92b96f6ebbdc77f82072ee23d.tar.xz hercules-7391e5d257587ec92b96f6ebbdc77f82072ee23d.zip | |
Merge pull request #2606 from Ridley8819/pcblocknpc
Adding PCBLOCK_NPC to setpcblock script command
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index c963c1680..6ba0db2f3 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -11467,7 +11467,9 @@ static void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action { struct npc_data *nd = map->id2nd(target_id); if (nd != NULL) { - npc->click(sd, nd); + if (sd->block_action.npc == 0) { // *pcblock script command + npc->click(sd, nd); + } return; } @@ -11942,7 +11944,7 @@ static void clif_parse_NpcClicked(int fd, struct map_session_data *sd) clif->clearunit_area(&sd->bl,CLR_DEAD); return; } - if (sd->npc_id || sd->state.workinprogress & 2) { + if (sd->npc_id > 0 || (sd->state.workinprogress & 2) == 2 || sd->block_action.npc == 1) { // *pcblock script command #if PACKETVER >= 20110308 clif->msgtable(sd, MSG_BUSY); #else |