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

Fixes timer deletion errors from skill_keep_using (#5355)

Browse Source 
* Fixes #5354.
* Fixes invalid or wrong timers getting deleted from skill_keep_using when using a second time.
* Adds skill casting checks to prevent timers from being created if the player can't cast the skill to begin with.
Thanks to @Masao87 and @admkakaroto!
This commit is contained in:
Aleos 2020-08-25 14:27:47 -04:00 committed by GitHub
parent 88b506a498
commit 09c6f7511d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/map/skill.cpp
View File

@ -11954,7 +11954,7 @@ TIMER_FUNC(skill_castend_id){
else else
skill_castend_damage_id(src,target,ud->skill_id,ud->skill_lv,tick,flag); skill_castend_damage_id(src,target,ud->skill_id,ud->skill_lv,tick,flag);
if( sd && sd->skill_keep_using.skill_id > 0 && sd->skill_keep_using.skill_id == ud->skill_id ){ if( sd && sd->skill_keep_using.skill_id > 0 && sd->skill_keep_using.skill_id == ud->skill_id && !skill_isNotOk(ud->skill_id, sd) && skill_check_condition_castbegin(sd, ud->skill_id, ud->skill_lv) ){
sd->skill_keep_using.tid = add_timer( sd->ud.canact_tick + 100, skill_keep_using, sd->bl.id, 0 ); sd->skill_keep_using.tid = add_timer( sd->ud.canact_tick + 100, skill_keep_using, sd->bl.id, 0 );
} }
@ -12036,8 +12036,10 @@ TIMER_FUNC(skill_castend_id){
sd->skillitem = sd->skillitemlv = sd->skillitem_keep_requirement = 0; sd->skillitem = sd->skillitemlv = sd->skillitem_keep_requirement = 0;
if (sd->skill_keep_using.skill_id > 0) { if (sd->skill_keep_using.skill_id > 0) {
sd->skill_keep_using.skill_id = 0; sd->skill_keep_using.skill_id = 0;
delete_timer(sd->skill_keep_using.tid, skill_keep_using); if (sd->skill_keep_using.tid != INVALID_TIMER) {
sd->skill_keep_using.tid = INVALID_TIMER; delete_timer(sd->skill_keep_using.tid, skill_keep_using);
sd->skill_keep_using.tid = INVALID_TIMER;
}
} }
} else if (md) } else if (md)
md->skill_idx = -1; md->skill_idx = -1;