summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-03 21:16:58 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-03 21:16:58 +0000
commite9dcdeba4a476418f5a7e46d0ee97b59984bcb67 (patch)
tree4f58dfc522eebf452ab1afc8a289c4acc70238ac /src/map/skill.c
parent4236f4ab6d7ab9038762a5d8c3c17c6665660896 (diff)
downloadhercules-e9dcdeba4a476418f5a7e46d0ee97b59984bcb67.tar.gz
hercules-e9dcdeba4a476418f5a7e46d0ee97b59984bcb67.tar.bz2
hercules-e9dcdeba4a476418f5a7e46d0ee97b59984bcb67.tar.xz
hercules-e9dcdeba4a476418f5a7e46d0ee97b59984bcb67.zip
Fixed bug with lullaby not ending after moving out of ensamble area (with longing for freedom), bugreport:411
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15368 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index db270655f..de6349746 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -12679,7 +12679,7 @@ int skill_unit_move_sub (struct block_list* bl, va_list ap)
//Necessary in case the group is deleted after calling on_place/on_out [Skotlex]
skill_id = unit->group->skill_id;
- if( unit->group->interval != -1 && !(skill_get_unit_flag(skill_id)&UF_DUALMODE) )
+ if( unit->group->interval != -1 && !(skill_get_unit_flag(skill_id)&UF_DUALMODE) && skill_id != BD_LULLABY ) //Lullaby is the exception, bugreport:411
{ //Non-dualmode unit skills with a timer don't trigger when walking, so just return
if( dissonance ) skill_dance_switch(unit, 1);
return 0;