summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-04 18:16:11 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-04 18:16:11 +0000
commitb8916a91b4a7200c2ee36a155a9c3ddbfa847831 (patch)
tree5ff7ceea6dfba8b2d4cc656e308aba529348e5f0 /src
parentdea1baafdf08de3957a4f48d0b5ec1d0a5677742 (diff)
downloadhercules-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
Diffstat (limited to 'src')
-rw-r--r--src/map/script.c4
1 files changed, 2 insertions, 2 deletions
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;
}