Jelajahi Sumber

- Should have fixed "sleep", thanks to Lance for figuring out the error.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8618 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 18 tahun lalu
induk
melakukan
9e07adc071
2 mengubah file dengan 4 tambahan dan 2 penghapusan
  1. 2 0
      Changelog-Trunk.txt
  2. 2 2
      src/map/script.c

+ 2 - 0
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

+ 2 - 2
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;
 }