diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-04 18:16:11 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-04 18:16:11 +0000 |
| commit | b8916a91b4a7200c2ee36a155a9c3ddbfa847831 (patch) | |
| tree | 5ff7ceea6dfba8b2d4cc656e308aba529348e5f0 | |
| parent | dea1baafdf08de3957a4f48d0b5ec1d0a5677742 (diff) | |
| download | hercules-b8916a91b4a7200c2ee36a155a9c3ddbfa847831.tar.gz hercules-b8916a91b4a7200c2ee36a155a9c3ddbfa847831.tar.bz2 hercules-b8916a91b4a7200c2ee36a155a9c3ddbfa847831.tar.xz hercules-b8916a91b4a7200c2ee36a155a9c3ddbfa847831.zip | |
- 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
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | 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; } |