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

Fixed remove trap skills

Browse Source 
Fixes #4605

Thanks to @Angelic234 and @mazvi
This commit is contained in:
Lemongrass3110 2020-02-05 23:29:01 +01:00
parent 5386a5bcf4
commit 57e50a1906
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/map/skill.cpp
View File

@ -8491,13 +8491,13 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
{ {
struct skill_unit* su; struct skill_unit* su;
struct skill_unit_group* sg = NULL; struct skill_unit_group* sg = NULL;
std::shared_ptr<s_skill_db> skill_group = skill_db.find(sg->skill_id); std::shared_ptr<s_skill_db> skill_group;
su = BL_CAST(BL_SKILL, bl); su = BL_CAST(BL_SKILL, bl);
// Mercenaries can remove any trap // Mercenaries can remove any trap
// Players can only remove their own traps or traps on Vs maps. // Players can only remove their own traps or traps on Vs maps.
if( su && (sg = su->group) && (src->type == BL_MER || sg->src_id == src->id || map_flag_vs(bl->m)) && skill_group->inf2[INF2_ISTRAP] ) if( su && (sg = su->group) && (src->type == BL_MER || sg->src_id == src->id || map_flag_vs(bl->m)) && ( skill_group = skill_db.find(sg->skill_id) ) && skill_group->inf2[INF2_ISTRAP] )
{ {
clif_skill_nodamage(src, bl, skill_id, skill_lv, 1); clif_skill_nodamage(src, bl, skill_id, skill_lv, 1);
if( sd && !(sg->unit_id == UNT_USED_TRAPS || (sg->unit_id == UNT_ANKLESNARE && sg->val2 != 0 )) ) if( sd && !(sg->unit_id == UNT_USED_TRAPS || (sg->unit_id == UNT_ANKLESNARE && sg->val2 != 0 )) )