From e9c1908de22b4a194ca70e8d46daa2a95c2e2fc4 Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 5 Sep 2006 02:51:57 +0000 Subject: - Fixed crash when using Adaptation during an Encore. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8627 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/skill.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/map/skill.c') diff --git a/src/map/skill.c b/src/map/skill.c index 8853dffbf..acbd081c4 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -9544,16 +9544,16 @@ void skill_stop_dancing (struct block_list *src) dsd = map_id2sd(sc->data[SC_DANCING].val4); sc->data[SC_DANCING].val4 = 0; } + status_change_end(src, SC_DANCING, -1); - if (group) - skill_delunitgroup(NULL, group, 0); - if (dsd) { dsd->sc.data[SC_DANCING].val4 = dsd->sc.data[SC_DANCING].val2 = 0; status_change_end(&dsd->bl, SC_DANCING, -1); } - status_change_end(src, SC_DANCING, -1); + + if (group) + skill_delunitgroup(NULL, group, 0); } /*========================================== @@ -9789,7 +9789,7 @@ int skill_delunitgroup (struct block_list *src, struct skill_unit_group *group, group->valstr=NULL; } - map_freeblock((struct block_list*)group->unit); + map_freeblock(&group->unit->bl); group->unit=NULL; group->group_id=0; group->unit_count=0; -- cgit v1.2.3-70-g09d2