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

Fixes #681

Browse Source 
* Follow up to 4019fb4.
* Corrects Hover not avoiding splash attack skills.
This commit is contained in:
aleos89 2016-01-12 14:17:51 -05:00
parent 8a730cdec9
commit e4a3811b92
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/map/skill.c
View File

@ -4569,6 +4569,11 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
if( flag&1 ) {//Recursive invocation if( flag&1 ) {//Recursive invocation
int sflag = skill_area_temp[0] & 0xFFF; int sflag = skill_area_temp[0] & 0xFFF;
int heal = 0; int heal = 0;
struct status_change *tsc = status_get_sc(bl);
if (tsc && tsc->data[SC_HOVERING] && skill_get_inf3(skill_id)&INF3_NO_EFF_HOVERING)
break; // Under Hovering characters are immune to select trap and ground target skills.
if( flag&SD_LEVEL ) if( flag&SD_LEVEL )
sflag |= SD_LEVEL; // -1 will be used in packets instead of the skill level sflag |= SD_LEVEL; // -1 will be used in packets instead of the skill level
if( skill_area_temp[1] != bl->id && !(skill_get_inf2(skill_id)&INF2_NPC_SKILL) ) if( skill_area_temp[1] != bl->id && !(skill_get_inf2(skill_id)&INF2_NPC_SKILL) )
@ -12813,7 +12818,7 @@ static int skill_unit_onplace(struct skill_unit *unit, struct block_list *bl, un
status_change_end(bl, SC_VACUUM_EXTREME, INVALID_TIMER); status_change_end(bl, SC_VACUUM_EXTREME, INVALID_TIMER);
if (sc && sc->data[SC_HOVERING] && skill_get_inf3(sg->skill_id)&INF3_NO_EFF_HOVERING) if (sc && sc->data[SC_HOVERING] && skill_get_inf3(sg->skill_id)&INF3_NO_EFF_HOVERING)
return 0; // Under Hovering characters are immune to trap and ground target skills. return 0; // Under Hovering characters are immune to select trap and ground target skills.
type = status_skill2sc(sg->skill_id); type = status_skill2sc(sg->skill_id);
sce = (sc && type != SC_NONE) ? sc->data[type] : NULL; sce = (sc && type != SC_NONE) ? sc->data[type] : NULL;