Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a crash due to group being redeleted when players are performing an ensemble and one of the partner's sp run out.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13888 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Inkfish 2009-06-14 15:29:04 +00:00
parent f93f3b1e33
commit c15ff51a7b
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. 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. 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 09/06/13
* If both Double Attack and critical attack have chance to trigger within one attack, Double Attack takes priority. (bugreport:3231) [Inkfish] * 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] * Fixed Butterfly Wings not working on maps blocking Teleport. (bugreport:3236) [Inkfish]

5
src/map/status.c
View File

@ -7059,7 +7059,10 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr data)
if (sc->data[SC_LONGING]) if (sc->data[SC_LONGING])
sp*= 3; sp*= 3;
if (!status_charge(bl, 0, sp)) if (!status_charge(bl, 0, sp))
break; {
skill_stop_dancing(bl);
return 0;
}
} }
sc_timer_next(1000+tick, status_change_timer, bl->id, data); sc_timer_next(1000+tick, status_change_timer, bl->id, data);
return 0; return 0;