* Fixed invalid state running of TK_JUMPKICK (Flying Kick).

- This was causing wrong damages when use the ability with 1 cell difference of your target.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15176 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 6 insertions, 2 deletions

diff --git a/src/map/skill.c b/src/map/skill.c
index 1bb733c44..57a3686c6 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -7300,8 +7300,12 @@ int skill_castend_id(int tid, unsigned int tick, int id, intptr_t data)
 			break;
 
 		if (ud->state.running && ud->skillid == TK_JUMPKICK)
+        {
+            ud->state.running = 0;
+            status_change_end(src, SC_RUN, -1);
 			flag = 1;
-
+		}
+		
 		if (ud->walktimer != INVALID_TIMER && ud->skillid != TK_RUN && ud->skillid != RA_WUGDASH)
 			unit_stop_walking(src,1);
 
diff --git a/src/map/unit.c b/src/map/unit.c
index 80dcc8e55..cf370676c 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -462,7 +462,7 @@ int unit_run(struct block_list *bl)
 		to_y += dir_y;
 	}
 
-	if(to_x == bl->x && to_y == bl->y) {
+	if(to_x == bl->x && to_y == bl->y || (to_x == (bl->x+1) || to_y == (bl->y+1)) || (to_x == (bl->x-1) || to_y == (bl->y-1))) {
 		//If you can't run forward, you must be next to a wall, so bounce back. [Skotlex]
 		clif_status_change(bl, SI_BUMP, 1, 0, 0, 0, 0);