diff options
| author | Haru <haru@dotalux.com> | 2018-07-28 04:48:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-28 04:48:16 +0200 |
| commit | 75c6eb16f8660eacd5d12e69237bea342c9c8352 (patch) | |
| tree | 0870056ef10735b935f3197c7a35a6a2ce3dcaa2 | |
| parent | fae8040ad22885b1d1215daa013f3db26f5ce60d (diff) | |
| parent | fbffed09e12da8579708ca822207b6d8757ec976 (diff) | |
| download | hercules-75c6eb16f8660eacd5d12e69237bea342c9c8352.tar.gz hercules-75c6eb16f8660eacd5d12e69237bea342c9c8352.tar.bz2 hercules-75c6eb16f8660eacd5d12e69237bea342c9c8352.tar.xz hercules-75c6eb16f8660eacd5d12e69237bea342c9c8352.zip | |
Merge pull request #2148 from MishimaHaruna/splasher-double-gemstone
Fix Venom Splasher consuming its gemstome requirement twice
| -rw-r--r-- | src/map/skill.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 745cdb7bc..a4ebff9f1 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -4649,6 +4649,11 @@ static int skill_castend_damage_id(struct block_list *src, struct block_list *bl // recursive invocation of skill->castend_damage_id() with flag|1 map->foreachinrange(skill->area_sub, bl, skill->get_splash(skill_id, skill_lv), skill->splash_target(src), src, skill_id, skill_lv, tick, flag|BCT_ENEMY|SD_SPLASH|1, skill->castend_damage_id); + if (skill_id == AS_SPLASHER) { + // Prevent double item consumption when the target explodes (item requirements have already been processed in skill_castend_nodamage_id) + flag |= 1; + } + if (sd && skill_id == SU_LUNATICCARROTBEAT) { short item_idx = pc->search_inventory(sd, ITEMID_CARROT); |