Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Follow up to r16434, moved the status_change_end() into the existing block above.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16877 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
brianluau 2012-11-08 22:15:23 +00:00
parent 669ae95e4a
commit 8d8cc71dab
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/map/pc.c
View File

@ -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); 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_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++ ) { for( i = 0; i < EQI_MAX; i++ ) {
if( sd->equip_index[ i ] >= 0 ) 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; 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; return 0;
} }