summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c4
-rw-r--r--src/map/unit.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index cd04f4428..437f95253 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3276,10 +3276,6 @@ bool battle_check_range(struct block_list *src,struct block_list *bl,int range)
if(src->m != bl->m) // 違うマップ
return false;
-
- if(src->type == BL_HOM && battle_config.hom_setting&0x2)
- ; //WTF, way to go Aegis and your awesome bugs.
- else
if (!check_distance_bl(src, bl, range))
return false;
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])