diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-09-06 20:56:41 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-09-06 20:56:41 +0000 |
| commit | ee2a0472e04446bfaa4086727744dad60b2d5d6d (patch) | |
| tree | 026f74e633137b16d8e6a7863609898259ab78e4 /src/map/skill.c | |
| parent | fcf9c8c31bb28d6580fa647766a1d8192c435c89 (diff) | |
| download | hercules-ee2a0472e04446bfaa4086727744dad60b2d5d6d.tar.gz hercules-ee2a0472e04446bfaa4086727744dad60b2d5d6d.tar.bz2 hercules-ee2a0472e04446bfaa4086727744dad60b2d5d6d.tar.xz hercules-ee2a0472e04446bfaa4086727744dad60b2d5d6d.zip | |
Fixed bugreport:6523 song duration exploit. credits to mkbu95! Thank you
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16753 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 7ca048ee4..ef2b91c24 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -11825,13 +11825,10 @@ static int skill_unit_effect (struct block_list* bl, va_list ap) skill_id = group->skill_id; //Target-type check. - if( !(group->bl_flag&bl->type && battle_check_target(&unit->bl,bl,group->target_flag)>0) ) - { - if( flag&4 && group->src_id == bl->id && group->state.song_dance&0x2 ) + if( !(group->bl_flag&bl->type && battle_check_target(&unit->bl,bl,group->target_flag)>0) && (flag&4) ) { + if( group->state.song_dance&0x1 || (group->src_id == bl->id && group->state.song_dance&0x2) ) skill_unit_onleft(skill_id, bl, tick);//Ensemble check to terminate it. - } - else - { + } else { if( flag&1 ) skill_unit_onplace(unit,bl,tick); else |