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

Fixed bugreport:4951 Bard/Dancer songs duration exploit fixed

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16109 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-05-13 09:30:31 +00:00
parent 13b40cc149
commit 8c720a9ebd
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/map/skill.c
View File

@ -10555,8 +10555,11 @@ static int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, un
case UNT_DONTFORGETME: case UNT_DONTFORGETME:
case UNT_FORTUNEKISS: case UNT_FORTUNEKISS:
case UNT_SERVICEFORYOU: case UNT_SERVICEFORYOU:
if (sg->src_id==bl->id && !(sc && sc->data[SC_SPIRIT] && sc->data[SC_SPIRIT]->val2 == SL_BARDDANCER)) if (sg->src_id==bl->id && !(sc && sc->data[SC_SPIRIT] && sc->data[SC_SPIRIT]->val2 == SL_BARDDANCER)) {
if( sce )/* We have the status but we're not elegible for it, so we take it away. (bugreport:4591) */
sce->val4 = 2;
return 0; return 0;
}
if (!sc) return 0; if (!sc) return 0;
if (!sce) if (!sce)
sc_start4(bl,type,100,sg->skill_lv,sg->val1,sg->val2,0,sg->limit); sc_start4(bl,type,100,sg->skill_lv,sg->val1,sg->val2,0,sg->limit);
@ -11347,13 +11350,17 @@ static int skill_unit_onleft (int skill_id, struct block_list *bl, unsigned int
case DC_DONTFORGETME: case DC_DONTFORGETME:
case DC_FORTUNEKISS: case DC_FORTUNEKISS:
case DC_SERVICEFORYOU: case DC_SERVICEFORYOU:
if (sce) if (sce) {
{ if( sce->val4 == 2 ) {/* We have the status but we're not elegible for it, so we take it away. (bugreport:4591) */
delete_timer(sce->timer, status_change_timer); if( !( sc && sc->data[SC_DANCING] && sc->data[SC_DANCING]->val2 ) )/* check if we're still in the skill */
//NOTE: It'd be nice if we could get the skill_lv for a more accurate extra time, but alas... status_change_end(bl,type,INVALID_TIMER);
//not possible on our current implementation. } else {
sce->val4 = 1; //Store the fact that this is a "reduced" duration effect. delete_timer(sce->timer, status_change_timer);
sce->timer = add_timer(tick+skill_get_time2(skill_id,1), status_change_timer, bl->id, type); //NOTE: It'd be nice if we could get the skill_lv for a more accurate extra time, but alas...
//not possible on our current implementation.
sce->val4 = 1; //Store the fact that this is a "reduced" duration effect.
sce->timer = add_timer(tick+skill_get_time2(skill_id,1), status_change_timer, bl->id, type);
}
} }
break; break;
case PF_FOGWALL: case PF_FOGWALL: