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

Fixes Blood Sucker not being able to be recast (#4968)

Browse Source 
* Fixes #4964.
* Fixes Blood Sucker not being able to be recast on another map if caster dies while active.
* Minor cleanups and added safety checks.
Thanks to @Everade!
This commit is contained in:
Aleos 2020-05-20 17:20:37 -04:00 committed by GitHub
parent ab628b2369
commit a34a2f6de0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/map/skill.cpp
View File

@ -10953,12 +10953,12 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
if( sc && sc->bs_counter < skill_get_maxcount( skill_id , skill_lv) ) { if( sc && sc->bs_counter < skill_get_maxcount( skill_id , skill_lv) ) {
if( tsc && tsc->data[type] ){ if( tsc && tsc->data[type] ){
(sc->bs_counter)--; sc->bs_counter--;
status_change_end(src, type, INVALID_TIMER); // the first one cancels and the last one will take effect resetting the timer status_change_end(src, type, INVALID_TIMER); // the first one cancels and the last one will take effect resetting the timer
} }
clif_skill_nodamage(src, bl, skill_id, skill_lv, 1); clif_skill_nodamage(src, bl, skill_id, skill_lv, 1);
sc_start2(src,bl, type, 100, skill_lv, src->id, skill_get_time(skill_id,skill_lv)); sc_start2(src,bl, type, 100, skill_lv, src->id, skill_get_time(skill_id,skill_lv));
(sc->bs_counter)++; sc->bs_counter++;
} else if( sd ) { } else if( sd ) {
clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0); clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0);
break; break;

7
src/map/status.cpp
View File

@ -13428,9 +13428,12 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const
case SC_BLOODSUCKER: case SC_BLOODSUCKER:
if( sce->val2 ) { if( sce->val2 ) {
struct block_list *src = map_id2bl(sce->val2); struct block_list *src = map_id2bl(sce->val2);
if(src) {
if (src && !status_isdead(src)) {
struct status_change *sc2 = status_get_sc(src); struct status_change *sc2 = status_get_sc(src);
sc2->bs_counter--;
if (sc2)
sc2->bs_counter--;
} }
} }
break; break;