diff options
| author | Mysterious <mysteriousragnarok@hotmail.com> | 2013-02-09 08:17:19 -0800 |
|---|---|---|
| committer | Mysterious <mysteriousragnarok@hotmail.com> | 2013-02-09 08:17:19 -0800 |
| commit | 8c943e75db3810f6606b41b99aa9f22c257b364e (patch) | |
| tree | f587fe4fa52e2415c1b110d195140aecd1254cdc /src/map/status.c | |
| parent | 5e76d9a1a0ab36af5d8ad072ea4dcbf6122b0ae9 (diff) | |
| parent | 7a8857cbf73d589ded8ef7bcf000063ad0ef1432 (diff) | |
| download | hercules-8c943e75db3810f6606b41b99aa9f22c257b364e.tar.gz hercules-8c943e75db3810f6606b41b99aa9f22c257b364e.tar.bz2 hercules-8c943e75db3810f6606b41b99aa9f22c257b364e.tar.xz hercules-8c943e75db3810f6606b41b99aa9f22c257b364e.zip | |
Merge pull request #3 from HerculesWS/master
Merging Hercules Changes
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/status.c b/src/map/status.c index 8fd48aefc..97b7c61a1 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1,6 +1,6 @@ // Copyright (c) Hercules dev team, licensed under GNU GPL. // See the LICENSE file -// Portions Copyright (c) Athena dev team +// Portions Copyright (c) Athena Dev Teams #include "../common/cbasetypes.h" #include "../common/timer.h" @@ -8663,7 +8663,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val unit_stop_walking(bl,1); break; case SC_ANKLE: - if( battle_config.skill_trap_type ) + if( battle_config.skill_trap_type || !map_flag_gvg(bl->m) ) unit_stop_walking(bl,1); break; case SC_HIDING: |