diff options
| author | Haru <haru@dotalux.com> | 2018-06-02 16:19:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-02 16:19:59 +0200 |
| commit | b8cdb8e191f17cb0c8798e0379be9d68c72d6368 (patch) | |
| tree | d177ea2eccf2207423c8deae85021ef7e5949512 /src/map/clif.c | |
| parent | e6596534654e7ca395c34db5a8d589ebbcaa0a7d (diff) | |
| parent | 90be2a7937e7552a72d1e7eb632e6bc2d01443ef (diff) | |
| download | hercules-b8cdb8e191f17cb0c8798e0379be9d68c72d6368.tar.gz hercules-b8cdb8e191f17cb0c8798e0379be9d68c72d6368.tar.bz2 hercules-b8cdb8e191f17cb0c8798e0379be9d68c72d6368.tar.xz hercules-b8cdb8e191f17cb0c8798e0379be9d68c72d6368.zip | |
Merge pull request #842 from AnnieRuru/request_6
Add new *pcblock script command
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index fa112d40e..3bdea3f7f 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -10489,6 +10489,9 @@ void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type, return; } + if (sd->block_action.sitstand) // *pcblock script command + break; + if (sd->ud.skilltimer != INVALID_TIMER || (sd->sc.opt1 && sd->sc.opt1 != OPT1_BURNING )) break; @@ -10516,6 +10519,9 @@ void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type, return; } + if (sd->block_action.sitstand) // *pcblock script command + break; + pc->update_idle_time(sd, BCIDLE_SIT); pc->setstand(sd); |