diff options
| author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-08 22:15:23 +0000 |
|---|---|---|
| committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-08 22:15:23 +0000 |
| commit | 8f32131382d5d2d4c469344f1a2337fe5a903850 (patch) | |
| tree | bddf37aff1be96a10e9531a322160c3f6d38c703 /src/map/pc.c | |
| parent | 8422b3401d1215992beea022f692aae24097c2ca (diff) | |
| download | hercules-8f32131382d5d2d4c469344f1a2337fe5a903850.tar.gz hercules-8f32131382d5d2d4c469344f1a2337fe5a903850.tar.bz2 hercules-8f32131382d5d2d4c469344f1a2337fe5a903850.tar.xz hercules-8f32131382d5d2d4c469344f1a2337fe5a903850.zip | |
- Follow up to r16434, moved the status_change_end() into the existing block above.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16877 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 0a48d2b03..cd4c9c125 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4643,6 +4643,8 @@ int pc_setpos(struct map_session_data* sd, unsigned short mapindex, int x, int y sce->timer = add_timer(gettick() + skill_get_time(SG_KNOWLEDGE, sce->val1), status_change_timer, sd->bl.id, SC_KNOWLEDGE); } status_change_end(&sd->bl, SC_PROPERTYWALK, INVALID_TIMER); + status_change_end(&sd->bl, SC_CLOAKING, INVALID_TIMER); + status_change_end(&sd->bl, SC_CLOAKINGEXCEED, INVALID_TIMER); } for( i = 0; i < EQI_MAX; i++ ) { if( sd->equip_index[ i ] >= 0 ) @@ -4741,12 +4743,6 @@ int pc_setpos(struct map_session_data* sd, unsigned short mapindex, int x, int y sd->md->ud.dir = sd->ud.dir; } - // If the player is changing maps, end cloaking and cloaking exceed. - if ( sd->state.changemap && sd->sc.count ) - { - status_change_end(&sd->bl, SC_CLOAKING, INVALID_TIMER); - status_change_end(&sd->bl, SC_CLOAKINGEXCEED, INVALID_TIMER); - } return 0; } |