diff options
| author | malufett <malufett.eat.my.binaries@gmail.com> | 2014-12-20 00:13:35 +0800 |
|---|---|---|
| committer | malufett <malufett.eat.my.binaries@gmail.com> | 2014-12-20 00:13:35 +0800 |
| commit | c4456ddbebccaca51ab040c60e3c586ed2cc0a10 (patch) | |
| tree | 53d3e23baab08d63d88fdc055f6880f884aac640 /src/map/status.c | |
| parent | 772cb2b111973c0c749e505ffd2685bb67e887bd (diff) | |
| parent | 68f0fee76a73612263984da5d9de1e32b7ffe7da (diff) | |
| download | hercules-c4456ddbebccaca51ab040c60e3c586ed2cc0a10.tar.gz hercules-c4456ddbebccaca51ab040c60e3c586ed2cc0a10.tar.bz2 hercules-c4456ddbebccaca51ab040c60e3c586ed2cc0a10.tar.xz hercules-c4456ddbebccaca51ab040c60e3c586ed2cc0a10.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/map/status.c b/src/map/status.c index 53672fccf..b1c86cc67 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -10466,8 +10466,12 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const if(opt_flag&4) //Out of hiding, invoke on place. skill->unit_move(bl,timer->gettick(),1); - if(opt_flag&2 && sd && map->getcell(bl->m,bl->x,bl->y,CELL_CHKNPC)) - npc->touch_areanpc(sd,bl->m,bl->x,bl->y); //Trigger on-touch event. + if (opt_flag & 2 && sd) { + if (map->getcell(bl->m,bl->x,bl->y,CELL_CHKNPC)) + npc->touch_areanpc(sd,bl->m,bl->x,bl->y); //Trigger on-touch event. + else + npc->untouch_areanpc(sd, bl->m, bl->x, bl->y); + } ers_free(status->data_ers, sce); return 1; |