diff options
| author | malufett <malufett.eat.my.binaries@gmail.com> | 2013-04-15 01:11:50 +0800 |
|---|---|---|
| committer | malufett <malufett.eat.my.binaries@gmail.com> | 2013-04-15 01:11:50 +0800 |
| commit | 7ba570eabc84865566f4335269f00b3640fa09db (patch) | |
| tree | 10b6519f5ce4a0d4696da594e8e6eedb9eb6e859 /src/map/unit.c | |
| parent | 0446b3c78d8360327a25548004b02549842c523d (diff) | |
| download | hercules-7ba570eabc84865566f4335269f00b3640fa09db.tar.gz hercules-7ba570eabc84865566f4335269f00b3640fa09db.tar.bz2 hercules-7ba570eabc84865566f4335269f00b3640fa09db.tar.xz hercules-7ba570eabc84865566f4335269f00b3640fa09db.zip | |
Fixed Bug #7152 and #7161
-SI_RIDING is not remove when changing job via @jobchange.
-RG_STRIPWEAPON should now only remove right hand weapon even if dual wielding.
-Fixed 'display_status_timers' conf where it doesn't work properly in newer clients.
-Reverted '14a406ee0e5c6ba25539cc98f27ff9c2b8047e2e' where it's already fixed @ 'b9c79ceb5bfc86809da1d3b6154da4222cb72734'.
Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
Diffstat (limited to 'src/map/unit.c')
| -rw-r--r-- | src/map/unit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index a6d8fcf53..c19214724 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1148,7 +1148,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, ui // Record the status of the previous skill) if(sd) { - if( (skill->get_inf2(skill_id)&(INF2_ENSEMBLE_SKILL|INF2_CHORUS_SKILL)) && skill->check_pc_partner(sd, skill_id, &skill_lv, 1, 0) < 1 ) { + if( (skill->get_inf2(skill_id)&INF2_ENSEMBLE_SKILL) && skill->check_pc_partner(sd, skill_id, &skill_lv, 1, 0) < 1 ) { clif->skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0); return 0; } |