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

Improvements to skill_detonator (#5118)

Browse Source 
* Fixes #3268.
* Adds more safety checks for possible nullptr skill_unit_group data.
* Adjusts order of failure checks to speed up operations.
Thanks to @uddevil and @ecdarreola!
This commit is contained in:
Aleos 2020-06-29 10:40:22 -04:00 committed by GitHub
parent f8721de7c0
commit f45b2dd0f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/map/skill.cpp
View File

@ -18048,21 +18048,25 @@ int skill_greed(struct block_list *bl, va_list ap)
/// Ranger's Detonator [Jobbie/3CeAM] /// Ranger's Detonator [Jobbie/3CeAM]
int skill_detonator(struct block_list *bl, va_list ap) int skill_detonator(struct block_list *bl, va_list ap)
{ {
struct skill_unit *unit = NULL;
struct block_list *src;
int unit_id;
nullpo_ret(bl); nullpo_ret(bl);
nullpo_ret(ap); nullpo_ret(ap);
src = va_arg(ap,struct block_list *); if (bl->type != BL_SKILL)
if( bl->type != BL_SKILL || (unit = (struct skill_unit *)bl) == NULL || !unit->group )
return 0;
if( unit->group->src_id != src->id )
return 0; return 0;
unit_id = unit->group->unit_id; block_list *src = va_arg(ap, block_list *);
skill_unit *unit = (skill_unit *)bl;
if (unit == nullptr)
return 0;
skill_unit_group *group = unit->group;
if (group == nullptr || group->src_id != src->id)
return 0;
int unit_id = group->unit_id;
switch( unit_id ) switch( unit_id )
{ //List of Hunter and Ranger Traps that can be detonate. { //List of Hunter and Ranger Traps that can be detonate.
case UNT_BLASTMINE: case UNT_BLASTMINE:
@ -18074,21 +18078,23 @@ int skill_detonator(struct block_list *bl, va_list ap)
case UNT_ICEBOUNDTRAP: case UNT_ICEBOUNDTRAP:
switch(unit_id) { switch(unit_id) {
case UNT_TALKIEBOX: case UNT_TALKIEBOX:
clif_talkiebox(bl,unit->group->valstr); clif_talkiebox(bl,group->valstr);
unit->group->val2 = -1; group->val2 = -1;
break; break;
case UNT_CLAYMORETRAP: case UNT_CLAYMORETRAP:
case UNT_FIRINGTRAP: case UNT_FIRINGTRAP:
case UNT_ICEBOUNDTRAP: case UNT_ICEBOUNDTRAP:
map_foreachinrange(skill_trap_splash,bl,skill_get_splash(unit->group->skill_id,unit->group->skill_lv),unit->group->bl_flag|BL_SKILL|~BCT_SELF,bl,unit->group->tick); map_foreachinrange(skill_trap_splash,bl,skill_get_splash(group->skill_id,group->skill_lv),group->bl_flag|BL_SKILL|~BCT_SELF,bl,group->tick);
break; break;
default: default:
map_foreachinrange(skill_trap_splash,bl,skill_get_splash(unit->group->skill_id,unit->group->skill_lv),unit->group->bl_flag,bl,unit->group->tick); map_foreachinrange(skill_trap_splash,bl,skill_get_splash(group->skill_id,group->skill_lv),group->bl_flag,bl,group->tick);
break; break;
} }
if (unit->group == nullptr)
return 0;
clif_changetraplook(bl, UNT_USED_TRAPS); clif_changetraplook(bl, UNT_USED_TRAPS);
unit->group->unit_id = UNT_USED_TRAPS; group->unit_id = UNT_USED_TRAPS;
unit->group->limit = DIFF_TICK(gettick(),unit->group->tick) + group->limit = DIFF_TICK(gettick(),group->tick) +
(unit_id == UNT_TALKIEBOX ? 5000 : (unit_id == UNT_CLUSTERBOMB || unit_id == UNT_ICEBOUNDTRAP? 2500 : (unit_id == UNT_FIRINGTRAP ? 0 : 1500)) ); (unit_id == UNT_TALKIEBOX ? 5000 : (unit_id == UNT_CLUSTERBOMB || unit_id == UNT_ICEBOUNDTRAP? 2500 : (unit_id == UNT_FIRINGTRAP ? 0 : 1500)) );
break; break;
} }