diff options
| author | Michieru <Michieru@users.noreply.github.com> | 2014-11-24 18:15:36 +0100 |
|---|---|---|
| committer | Michieru <Michieru@users.noreply.github.com> | 2014-11-24 18:15:36 +0100 |
| commit | 883ffd90b3021e561616943d210d045fd441ef66 (patch) | |
| tree | b00482a4fef26a7c9911923abf32940731854898 | |
| parent | 0623d4ff87906d9ea0aee7bf612da2d1afdee1cd (diff) | |
| parent | 90d0bcbfd0534d0cc064ce4d9549b64122fde447 (diff) | |
| download | hercules-883ffd90b3021e561616943d210d045fd441ef66.tar.gz hercules-883ffd90b3021e561616943d210d045fd441ef66.tar.bz2 hercules-883ffd90b3021e561616943d210d045fd441ef66.tar.xz hercules-883ffd90b3021e561616943d210d045fd441ef66.zip | |
Merge pull request #402 from GrumpyLittlePanda/master
Correction, safetywall still consumes sp when cast on LP.
| -rw-r--r-- | src/map/skill.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 8c452252a..29ec2c524 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2858,9 +2858,9 @@ int skill_check_unit_range_sub (struct block_list *bl, va_list ap) { switch (skill_id) { case AL_PNEUMA: - case MG_SAFETYWALL: if(g_skill_id == SA_LANDPROTECTOR) break; + case MG_SAFETYWALL: case MH_STEINWAND: case SC_MAELSTROM: case SO_ELEMENTAL_SHIELD: @@ -10107,6 +10107,11 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui } case MG_SAFETYWALL: + if (map->foreachincell(skill->cell_overlap,src->m,x,y,BL_SKILL)) { + skill->unitsetting(src,skill_id,skill_lv,x,y,0); + return 0; // Don't consume gems if cast on LP + } + case MG_FIREWALL: case MG_THUNDERSTORM: |