summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-01-13 03:08:36 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-01-13 03:08:36 +0000
commitdd0cb3c57ad80187ae97467aed36a3718e2629ec (patch)
treeea5d4751f741fd15068a65a4aac1a7a3527ac508
parent022423b0ef56edb26303a4d5dfa497db617c9406 (diff)
downloadhercules-dd0cb3c57ad80187ae97467aed36a3718e2629ec.tar.gz
hercules-dd0cb3c57ad80187ae97467aed36a3718e2629ec.tar.bz2
hercules-dd0cb3c57ad80187ae97467aed36a3718e2629ec.tar.xz
hercules-dd0cb3c57ad80187ae97467aed36a3718e2629ec.zip
- Fixed a possible ers_entry corruption if you die from bleeding while under the effects of kaizel.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12063 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/status.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 703495ec5..150a192f8 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2008/01/13
+ * Fixed a possible ers_entry corruption if you die from bleeding while
+ under the effects of kaizel.
* Updated Safety wall so it does not blocks melee magic. [Skotlex]
2008/01/12
* Another possible fix to ers/status_change crashing.
diff --git a/src/map/status.c b/src/map/status.c
index 0b1312586..06741b587 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -6818,7 +6818,7 @@ int status_change_timer(int tid, unsigned int tick, int id, int data)
case SC_BLEEDING:
if (--(sce->val4) >= 0) {
status_fix_damage(NULL, bl, rand()%600 + 200, 0);
- if (status_isdead(bl))
+ if (status_isdead(bl) || !sc->data[type]) //It is possible you revived from kaizel if killed.
break;
sc_timer_next(10000 + tick, status_change_timer, bl->id, data );
return 0;