diff options
| author | Kisuka <kisuka@kisuka.com> | 2014-04-15 19:58:24 -0700 |
|---|---|---|
| committer | Kisuka <kisuka@kisuka.com> | 2014-04-15 19:58:24 -0700 |
| commit | 8a84d46a19b0112b7e2417728b8816e8b34b7383 (patch) | |
| tree | 1eff6059486418f96d0bd384a09a00235333c6ce /src/map/clif.c | |
| parent | 7dab561f42bcc47199013d7a6c86e8aa2a9e6266 (diff) | |
| parent | be0de5a9f6c0b4ceeaa70b044d58ae584e97d9fd (diff) | |
| download | hercules-8a84d46a19b0112b7e2417728b8816e8b34b7383.tar.gz hercules-8a84d46a19b0112b7e2417728b8816e8b34b7383.tar.bz2 hercules-8a84d46a19b0112b7e2417728b8816e8b34b7383.tar.xz hercules-8a84d46a19b0112b7e2417728b8816e8b34b7383.zip | |
Merge pull request #274 from vthibault/master
Server side check to prevent player from attacking while sitting.
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index ff8cc9653..7715e6c6a 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -10101,7 +10101,7 @@ void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type, return; } - if( pc_cant_act(sd) || sd->sc.option&OPTION_HIDE ) + if( pc_cant_act(sd) || pc_issit(sd) || sd->sc.option&OPTION_HIDE ) return; if( sd->sc.option&OPTION_COSTUME ) |