diff options
| author | Ridley <ridley8819@gmail.com> | 2020-01-08 01:21:21 +0100 |
|---|---|---|
| committer | Ridley <ridley8819@gmail.com> | 2020-01-09 01:00:55 +0100 |
| commit | e6199edca8ad4eee32b7e34318f99f365d8520db (patch) | |
| tree | 7b1a6e123e80bc667530b7abaac28812035b41a0 /src/map/clif.c | |
| parent | bf99547843038bc15dc1948748d969950e866465 (diff) | |
| download | hercules-e6199edca8ad4eee32b7e34318f99f365d8520db.tar.gz hercules-e6199edca8ad4eee32b7e34318f99f365d8520db.tar.bz2 hercules-e6199edca8ad4eee32b7e34318f99f365d8520db.tar.xz hercules-e6199edca8ad4eee32b7e34318f99f365d8520db.zip | |
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 31fb00c37..a3aabb08d 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 |