summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/map/status.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index b8fe62b80..71fd7d9d6 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,9 @@ 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.
+2006/09/03
+ * Fixed SC_BERSERK's no regen penalty lasting pretty much forever.
+ [Skotlex]
2006/09/02
* SC_REGENERATION's val4 now holds the RGN flag of what is blocked rather
than blocking all types of regen. [Skotlex]
diff --git a/src/map/status.c b/src/map/status.c
index 3c98b3b90..665d1df1e 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -6126,7 +6126,7 @@ int status_change_end( struct block_list* bl , int type,int tid )
if(sc->data[SC_ENDURE].timer != -1)
status_change_end(bl, SC_ENDURE, -1);
sc_start4(bl, SC_REGENERATION, 100, 10,0,0,(RGN_HP|RGN_SP),
- gettick()+skill_get_time(LK_BERSERK, sc->data[type].val1));
+ skill_get_time(LK_BERSERK, sc->data[type].val1));
break;
case SC_GRAVITATION:
if (sc->data[type].val3 == BCT_SELF) {