diff options
| author | Haru <haru@dotalux.com> | 2020-03-09 00:38:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-09 00:38:45 +0100 |
| commit | 2ec28927c81008a0e17d7e95e70d207de0954d83 (patch) | |
| tree | e4b9042e09e60861726d8b3faae9f6bb400bf97b /src/map/unit.c | |
| parent | f80d9a72ae9e266d123d5f12ea751645691887ce (diff) | |
| parent | 5baef19736fbe26f8b0ac23e61059c14afb6211c (diff) | |
| download | hercules-2ec28927c81008a0e17d7e95e70d207de0954d83.tar.gz hercules-2ec28927c81008a0e17d7e95e70d207de0954d83.tar.bz2 hercules-2ec28927c81008a0e17d7e95e70d207de0954d83.tar.xz hercules-2ec28927c81008a0e17d7e95e70d207de0954d83.zip | |
Merge pull request #2648 from Kenpachi2k13/itemskill_fix
Fix itemskill() script command
Diffstat (limited to 'src/map/unit.c')
| -rw-r--r-- | src/map/unit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index 99682e2d3..d2cfcb03d 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1145,7 +1145,7 @@ static int unit_skilluse_id(struct block_list *src, int target_id, uint16 skill_ int ret = unit->skilluse_id2(src, target_id, skill_id, skill_lv, casttime, castcancel); struct map_session_data *sd = BL_CAST(BL_PC, src); - if (sd != NULL) + if (sd != NULL && (ret == 0 || !skill->is_item_skill(sd, skill_id, skill_lv))) pc->itemskill_clear(sd); return ret; @@ -1782,7 +1782,7 @@ static int unit_skilluse_pos(struct block_list *src, short skill_x, short skill_ int ret = unit->skilluse_pos2(src, skill_x, skill_y, skill_id, skill_lv, casttime, castcancel); struct map_session_data *sd = BL_CAST(BL_PC, src); - if (sd != NULL) + if (sd != NULL && (ret == 0 || !skill->is_item_skill(sd, skill_id, skill_lv))) pc->itemskill_clear(sd); return ret; |