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

Correct Aqua Benedicta interaction with Watery Evasion to match official behavior. Fixes #1119

Browse Source
This commit is contained in:
Jittapan Pluemsumran 2016-04-17 17:45:02 +07:00
parent 33efbd0869
commit 21c636c12b
No known key found for this signature in database
GPG Key ID: CE430096446F41D9
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/map/skill.c
View File

@ -7347,8 +7347,12 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
case AL_HOLYWATER: case AL_HOLYWATER:
if(sd) { if(sd) {
if (skill_produce_mix(sd, skill_id, ITEMID_HOLY_WATER, 0, 0, 0, 1, -1)) if (skill_produce_mix(sd, skill_id, ITEMID_HOLY_WATER, 0, 0, 0, 1, -1)) {
struct skill_unit* su;
if ((su = map_find_skill_unit_oncell(bl, bl->x, bl->y, NJ_SUITON, NULL, 0)) != NULL)
skill_delunit(su);
clif_skill_nodamage(src, bl, skill_id, skill_lv, 1); clif_skill_nodamage(src, bl, skill_id, skill_lv, 1);
}
else else
clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0); clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
} }
@ -15363,6 +15367,12 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i
return false; return false;
} }
break; break;
case AL_HOLYWATER:
if (map_getcell(sd->bl.m, sd->bl.x, sd->bl.y, CELL_CHKLANDPROTECTOR)) {
clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
return false; // Aqua Benedicta will not cast on LP [secretdataz]
}
break;
} }
/* check state required */ /* check state required */