From 8127768000292c09723018883029ff8a154acc19 Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 22 Jan 2008 13:13:57 +0000 Subject: - Removed hom_setting&02 (ignore skill range) as this was fixed by Gravity some time ago. - Moved pc_delinvincibletimer from unit_removemap to unit_free as the previous method has a logic glitch that could cause an on-place event to trigger after the on-left event. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12130 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/unit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/map/unit.c') diff --git a/src/map/unit.c b/src/map/unit.c index 287feddad..3ae4aa091 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1640,7 +1640,7 @@ int unit_remove_map(struct block_list *bl, int clrtype) if (bl->type&BL_CHAR) { skill_unit_move(bl,gettick(),4); - skill_cleartimerskill(bl); // タイマースキルクリア + skill_cleartimerskill(bl); } switch( bl->type ) @@ -1673,7 +1673,6 @@ int unit_remove_map(struct block_list *bl, int clrtype) sd->menuskill_id = sd->menuskill_val = 0; sd->npc_shopid = 0; - pc_delinvincibletimer(sd); if(sd->pvp_timer!=-1) { delete_timer(sd->pvp_timer,pc_calc_pvprank_timer); @@ -1763,6 +1762,7 @@ int unit_free(struct block_list *bl, int clrtype) if(status_isdead(bl)) pc_setrestartvalue(sd,2); + pc_delinvincibletimer(sd); //Status that are not saved... if(sd->sc.count) { if(sd->sc.data[SC_SPURT]) -- cgit v1.2.3-60-g2f50