1 files changed, 16 insertions, 5 deletions

diff --git a/src/map/unit.c b/src/map/unit.c
index 739a369a6..79abb8c6a 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -668,11 +668,12 @@ void unit_run_hit(struct block_list *bl, struct status_change *sc, struct map_se
 	ud->state.running = 0;
 	status_change_end(bl, type, INVALID_TIMER);
 
-	if( type == SC_RUN ) {
-		skill->blown(bl,bl,skill->get_blewcount(TK_RUN,lv),unit->getdir(bl),0);
+	if (type == SC_RUN) {
+		if (lv > 0)
+			skill->blown(bl, bl, skill->get_blewcount(TK_RUN, lv), unit->getdir(bl), 0);
 		clif->fixpos(bl); //Why is a clif->slide (skill->blown) AND a fixpos needed? Ask Aegis.
-		clif->sc_end(bl,bl->id,AREA,SI_TING);
-	} else if( sd ) {
+		clif->sc_end(bl, bl->id, AREA, SI_TING);
+	} else if (sd) {
 		clif->fixpos(bl);
 		skill->castend_damage_id(bl, &sd->bl, RA_WUGDASH, lv, timer->gettick(), SD_LEVEL);
 	}
@@ -1461,7 +1462,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, ui
 		} else if( src->type == BL_MER && skill_id == MA_REMOVETRAP ) {
 			if( !battle->check_range(battle->get_master(src), target, range + 1) )
 				return 0; // Aegis calc remove trap based on Master position, ignoring mercenary O.O
-		} else if( !battle->check_range(src, target, range + (skill_id == RG_CLOSECONFINE?0:2)) ) {
+		} else if (!battle->check_range(src, target, range)) {
 			return 0; // Arrow-path check failed.
 		}
 	}
@@ -1666,6 +1667,9 @@ int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, ui
 	} else
 		skill->castend_id(ud->skilltimer,tick,src->id,0);
 
+	if (sd != NULL && battle_config.prevent_logout_trigger & PLT_SKILL)
+		sd->canlog_tick = timer->gettick();
+
 	return 1;
 }
 
@@ -1812,6 +1816,10 @@ int unit_skilluse_pos2( struct block_list *src, short skill_x, short skill_y, ui
 		ud->skilltimer = INVALID_TIMER;
 		skill->castend_pos(ud->skilltimer,tick,src->id,0);
 	}
+
+	if (sd != NULL && battle_config.prevent_logout_trigger & PLT_SKILL)
+		sd->canlog_tick = timer->gettick();
+
 	return 1;
 }
 
@@ -2252,6 +2260,9 @@ int unit_attack_timer_sub(struct block_list* src, int tid, int64 tick)
 		ud->attacktimer = timer->add(ud->attackabletime,unit->attack_timer,src->id,0);
 	}
 
+	if (sd != NULL && battle_config.prevent_logout_trigger & PLT_ATTACK)
+		sd->canlog_tick = timer->gettick();
+
 	return 1;
 }