summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-09-09 21:22:56 -0300
committershennetsind <ind@henn.et>2013-09-09 21:22:56 -0300
commite2330c62a66a605fcfc5878cf7bb8875d97fff4f (patch)
tree9d4608ba35cc255007280fc34920d1fc3d4a2c53 /src
parent58e2d279f26e9f9034ca80646a82addaafeb7ef2 (diff)
downloadhercules-e2330c62a66a605fcfc5878cf7bb8875d97fff4f.tar.gz
hercules-e2330c62a66a605fcfc5878cf7bb8875d97fff4f.tar.bz2
hercules-e2330c62a66a605fcfc5878cf7bb8875d97fff4f.tar.xz
hercules-e2330c62a66a605fcfc5878cf7bb8875d97fff4f.zip
Fixed Bug #6735
Fixed a skill unit bug that'd run it on nearby targets disregarding friend-or-foe data. Special Thanks to Haruna for reproducing and providing all the information. http://hercules.ws/board/tracker/issue-6735-dancer-please-dont-forget-me/ Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 0f52517c6..f707395eb 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -12102,8 +12102,8 @@ int skill_unit_effect (struct block_list* bl, va_list ap) {
//Necessary in case the group is deleted after calling on_place/on_out [Skotlex]
skill_id = group->skill_id;
//Target-type check.
- if( !(group->bl_flag&bl->type && battle->check_target(&unit->bl,bl,group->target_flag)>0) && (flag&4) ) {
- if( group->state.song_dance&0x1 || (group->src_id == bl->id && group->state.song_dance&0x2) )
+ if( !(group->bl_flag&bl->type && battle->check_target(&unit->bl,bl,group->target_flag)>0) ) {
+ if( (flag&4) && ( group->state.song_dance&0x1 || (group->src_id == bl->id && group->state.song_dance&0x2) ) )
skill->unit_onleft(skill_id, bl, tick);//Ensemble check to terminate it.
} else {
if( flag&1 )