summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-06-14 15:29:04 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-06-14 15:29:04 +0000
commitcb97daa51d79e83313b9d8b130f1909140faed3a (patch)
tree30c2b6ba1885ecdb324d7761d6383da805e064c4 /src
parentcc28e7f29c421fb5eb9b6f27b7852e8df8718b2f (diff)
downloadhercules-cb97daa51d79e83313b9d8b130f1909140faed3a.tar.gz
hercules-cb97daa51d79e83313b9d8b130f1909140faed3a.tar.bz2
hercules-cb97daa51d79e83313b9d8b130f1909140faed3a.tar.xz
hercules-cb97daa51d79e83313b9d8b130f1909140faed3a.zip
Fixed a crash due to group being redeleted when players are performing an ensemble and one of the partner's sp run out.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13888 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/status.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map/status.c b/src/map/status.c
index f9db3f9c6..5f24e244d 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -7059,7 +7059,10 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr data)
if (sc->data[SC_LONGING])
sp*= 3;
if (!status_charge(bl, 0, sp))
- break;
+ {
+ skill_stop_dancing(bl);
+ return 0;
+ }
}
sc_timer_next(1000+tick, status_change_timer, bl->id, data);
return 0;