From b8916a91b4a7200c2ee36a155a9c3ddbfa847831 Mon Sep 17 00:00:00 2001 From: skotlex Date: Mon, 4 Sep 2006 18:16:11 +0000 Subject: - Should have fixed "sleep", thanks to Lance for figuring out the error. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8618 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 ++ src/map/script.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 5c84ad45c..e0ce38255 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. 2006/09/04 + * Should have fixed "sleep", thanks to Lance for figuring out the error. + [Skotlex] * SC_REFLECTSHIELD will now be passed to devoted characters at cast-time. [Skotlex] * Added a check to make a mob's level 1 if the read level from the db is diff --git a/src/map/script.c b/src/map/script.c index fea3661dd..f881a5548 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -2582,8 +2582,8 @@ int run_script_timer(int tid, unsigned int tick, int id, int data) } node = node->next; } - //Cancel tick value or run_script_main can get into an infinite loop by always delaying execution. [Skotlex] - st->sleep.tick = 0; + if(st->state != RERUNLINE) + st->sleep.tick = 0; run_script_main(st); return 0; } -- cgit v1.2.3-70-g09d2