Intimidate now checks the distance between source and target in case it kills the target and then warps the respawned one.

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

2 files changed, 2 insertions, 1 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 1ab4b2709..0bb9877ad 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2010/01/19
 	* Snatch should warp you anyway even if the target died. [Inkfish]
+	* Snatch now checks the distance between source and target in case it kills the target and then warps the respawned one. [Inkfish]
 2010/01/16
 	* Fixed items don't grant skill if you had this skill before and then changed your job. [Inkfish]
 2010/01/14
diff --git a/src/map/skill.c b/src/map/skill.c
index 8fadb870e..7dc71da7d 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2313,7 +2313,7 @@ static int skill_timerskill(int tid, unsigned int tick, int id, intptr data)
 			break;
 		if(skl->target_id) {
 			target = map_id2bl(skl->target_id);
-			if( skl->skill_id == RG_INTIMIDATE && (!target || target->prev == NULL) )
+			if( skl->skill_id == RG_INTIMIDATE && (!target || target->prev == NULL || !check_distance_bl(src,target,AREA_SIZE)) )
 				target = src; //Required since it has to warp.
 			if(target == NULL)
 				break;