diff options
author | panikon <panikon@zoho.com> | 2014-03-20 19:00:02 -0300 |
---|---|---|
committer | panikon <panikon@zoho.com> | 2014-03-20 19:00:02 -0300 |
commit | 0100bae77ee878e32be116bce33453b4da1b6e42 (patch) | |
tree | 21e683bde5f8b3364428a90d55f80a391b175f36 /src/map/unit.c | |
parent | a80bfc15cf01d55c556ee2924349511096bd4467 (diff) | |
download | hercules-0100bae77ee878e32be116bce33453b4da1b6e42.tar.gz hercules-0100bae77ee878e32be116bce33453b4da1b6e42.tar.bz2 hercules-0100bae77ee878e32be116bce33453b4da1b6e42.tar.xz hercules-0100bae77ee878e32be116bce33453b4da1b6e42.zip |
Fixed issue: 8047
http://hercules.ws/board/tracker/issue-8047-taekwon-stance-item/
Diffstat (limited to 'src/map/unit.c')
-rw-r--r-- | src/map/unit.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index 5dd63879f..39fff0eab 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1092,8 +1092,12 @@ int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, ui sc = NULL; //Unneeded //temp: used to signal combo-skills right now. - if (sc && sc->data[SC_COMBOATTACK] && (sc->data[SC_COMBOATTACK]->val1 == skill_id || - (sd?skill->check_condition_castbegin(sd,skill_id,skill_lv):0) )) { + if (sc && sc->data[SC_COMBOATTACK] + && skill->is_combo(skill_id) + && (sc->data[SC_COMBOATTACK]->val1 == skill_id + || ( sd?skill->check_condition_castbegin(sd,skill_id,skill_lv):0 ) + ) + ) { if (sc->data[SC_COMBOATTACK]->val2) target_id = sc->data[SC_COMBOATTACK]->val2; else |