From 89ac4c57bd44fdab3c6c6c05f262d406fe2c15fc Mon Sep 17 00:00:00 2001 From: amber Date: Tue, 28 Dec 2004 20:21:37 +0000 Subject: update git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@848 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog.txt | 2 ++ src/map/pc.c | 1 + 2 files changed, 3 insertions(+) diff --git a/Changelog.txt b/Changelog.txt index cd02c7235..e46c90624 100644 --- a/Changelog.txt +++ b/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 diff --git a/src/map/pc.c b/src/map/pc.c index fd84742c4..e42122665 100644 --- a/src/map/pc.c +++ b/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); -- cgit v1.2.3-70-g09d2