diff options
| author | glighta <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2013-02-21 06:59:42 +0000 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-04-11 15:52:04 -0300 |
| commit | 0e6dcf7291164716aa47940e5967489e13cebfb6 (patch) | |
| tree | e6bd3418317fefe876dd5a9b29a537c8693d8b04 /src/map/map.c | |
| parent | cafe335b38d41ec3986eedf5ecd156f354ea2c37 (diff) | |
| download | hercules-0e6dcf7291164716aa47940e5967489e13cebfb6.tar.gz hercules-0e6dcf7291164716aa47940e5967489e13cebfb6.tar.bz2 hercules-0e6dcf7291164716aa47940e5967489e13cebfb6.tar.xz hercules-0e6dcf7291164716aa47940e5967489e13cebfb6.zip | |
-Fix SC__SHADOWFORM not ending if target does not move after being warp. bugreport:7271
-- Thus allowing to inflict damage between map (only if both player don't move).
-- Cleanup old map-check on move check.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17148 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/map.c b/src/map/map.c index 779070f0e..dbff42fa3 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -413,7 +413,7 @@ int map_moveblock(struct block_list *bl, int x1, int y1, unsigned int tick) if( bl->type == BL_PC && ((TBL_PC*)bl)->shadowform_id ) {//Shadow Form Target Moving struct block_list *d_bl; - if( (d_bl = map_id2bl(((TBL_PC*)bl)->shadowform_id)) == NULL || bl->m != d_bl->m || !check_distance_bl(bl,d_bl,10) ) { + if( (d_bl = map_id2bl(((TBL_PC*)bl)->shadowform_id)) == NULL || !check_distance_bl(bl,d_bl,10) ) { if( d_bl ) status_change_end(d_bl,SC__SHADOWFORM,INVALID_TIMER); ((TBL_PC*)bl)->shadowform_id = 0; @@ -438,7 +438,7 @@ int map_moveblock(struct block_list *bl, int x1, int y1, unsigned int tick) if( sc->data[SC__SHADOWFORM] ) {//Shadow Form Caster Moving struct block_list *d_bl; - if( (d_bl = map_id2bl(sc->data[SC__SHADOWFORM]->val2)) == NULL || bl->m != d_bl->m || !check_distance_bl(bl,d_bl,10) ) + if( (d_bl = map_id2bl(sc->data[SC__SHADOWFORM]->val2)) == NULL || !check_distance_bl(bl,d_bl,10) ) status_change_end(bl,SC__SHADOWFORM,INVALID_TIMER); } |