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/atcommand.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/atcommand.c')
| -rw-r--r-- | src/map/atcommand.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index c81196d32..290611c9b 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -7528,11 +7528,11 @@ ACMD(sizeguild) *------------------------------------------*/ ACMD(monsterignore) { - if (!sd->state.monster_ignore) { - sd->state.monster_ignore = 1; + if (!sd->block_action.immune) { + sd->block_action.immune = 1; clif->message(sd->fd, msg_fd(fd,1305)); // You are now immune to attacks. } else { - sd->state.monster_ignore = 0; + sd->block_action.immune = 0; clif->message(sd->fd, msg_fd(fd,1306)); // Returned to normal state. } @@ -10096,6 +10096,8 @@ bool atcommand_exec(const int fd, struct map_session_data *sd, const char *messa return false; } } + if (sd->block_action.commands) // *pcblock script command + return false; if (*message == atcommand->char_symbol) is_atcommand = false; |