update

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@848 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog.txt

@@ -1,5 +1,7 @@
 Date	Added
 12/28
+	* Fix double timer_delete caused by pc_alive_timer (SVN 848)
+	  [MouseJstr]
 	* Fixed typo in npcs_athena.conf (mc_cameri verses mc_Cameri),
 	  thanks Mellow972 for pointing that out (SVN 845) [MouseJstr]
         * Reduced weapon breaking chance for Overthrust, thanks Draco - i almost

src/map/pc.c

@@ -7846,6 +7846,7 @@ int pc_alive_timer(int tid,unsigned int tick,int id,int data)
 	nullpo_retr(0, sd);
 	if(sd->alive_timer != tid)
 		return 0;
+	sd->alive_timer = -1;
 //	map_quit(sd);
 	clif_timedout (sd);