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/unit.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/unit.c')
| -rw-r--r-- | src/map/unit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index 64885541f..0924e6cf2 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -309,7 +309,7 @@ int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) { if (bl->prev == NULL) //Script could have warped char, abort remaining of the function. return 0; } else - sd->areanpc_id=0; + npc->untouch_areanpc(sd, bl->m, x, y); if( sd->md ) { // mercenary should be warped after being 3 seconds too far from the master [greenbox] if( !check_distance_bl(&sd->bl, &sd->md->bl, MAX_MER_DISTANCE) ) { @@ -767,7 +767,7 @@ int unit_movepos(struct block_list *bl, short dst_x, short dst_y, int easy, bool if (bl->prev == NULL) //Script could have warped char, abort remaining of the function. return 0; } else - sd->areanpc_id=0; + npc->untouch_areanpc(sd, bl->m, bl->x, bl->y); if( sd->status.pet_id > 0 && sd->pd && sd->pd->pet.intimate > 0 ) { // Check if pet needs to be teleported. [Skotlex] @@ -867,7 +867,7 @@ int unit_blown(struct block_list* bl, int dx, int dy, int count, int flag) if(map->getcell(bl->m, bl->x, bl->y, CELL_CHKNPC)) { npc->touch_areanpc(sd, bl->m, bl->x, bl->y); } else { - sd->areanpc_id = 0; + npc->untouch_areanpc(sd, bl->m, bl->x, bl->y);; } } } |