summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/status.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index e575d1bcc..9614b9d7a 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+09/06/14
+ * Fixed a crash due to group being redeleted when players are performing an ensemble and one of the partner's sp run out. [Inkfish]
09/06/13
* If both Double Attack and critical attack have chance to trigger within one attack, Double Attack takes priority. (bugreport:3231) [Inkfish]
* Fixed Butterfly Wings not working on maps blocking Teleport. (bugreport:3236) [Inkfish]
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;