diff --git a/trunk/dist/game/data/scripts/handlers/EffectMasterHandler.java b/trunk/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 455bbbf35a..49cf532bc4 100644
--- a/trunk/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/trunk/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -111,6 +111,7 @@ public final class EffectMasterHandler
 		ImmobileBuff.class,
 		ImmobilePetBuff.class,
 		Invincible.class,
+		JumpToFriend.class,
 		KnockBack.class,
 		KnockDown.class,
 		Lethal.class,
@@ -186,7 +187,6 @@ public final class EffectMasterHandler
 		TargetMeProbability.class,
 		Teleport.class,
 		TeleportToTarget.class,
-		ThrowHorizontal.class,
 		ThrowUp.class,
 		TransferDamage.class,
 		TransferHate.class,
diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/ThrowHorizontal.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/JumpToFriend.java
similarity index 74%
rename from trunk/dist/game/data/scripts/handlers/effecthandlers/ThrowHorizontal.java
rename to trunk/dist/game/data/scripts/handlers/effecthandlers/JumpToFriend.java
index a6f48e35b3..e890954cad 100644
--- a/trunk/dist/game/data/scripts/handlers/effecthandlers/ThrowHorizontal.java
+++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/JumpToFriend.java
@@ -18,6 +18,8 @@
  */
 package handlers.effecthandlers;
 
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
@@ -28,12 +30,12 @@ import com.l2jserver.gameserver.network.serverpackets.FlyToLocation.FlyType;
 import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
 
 /**
- * Throw Horizontal effect implementation.
+ * Jump to Friend effect implementation.
  * @author Mobius
  */
-public final class ThrowHorizontal extends AbstractEffect
+public final class JumpToFriend extends AbstractEffect
 {
-	public ThrowHorizontal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
+	public JumpToFriend(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
 	}
@@ -73,8 +75,10 @@ public final class ThrowHorizontal extends AbstractEffect
 			return;
 		}
 		
-		info.getEffected().broadcastPacket(new FlyToLocation(info.getEffected(), info.getEffector().getX(), info.getEffector().getY(), info.getEffector().getZ(), FlyType.THROW_HORIZONTAL));
-		info.getEffected().setXYZ(info.getEffector().getX(), info.getEffector().getY(), info.getEffector().getZ());
-		info.getEffected().broadcastPacket(new ValidateLocation(info.getEffected()));
+		final Location destination = GeoData.getInstance().moveCheck(info.getEffected().getX(), info.getEffected().getY(), info.getEffected().getZ(), info.getEffector().getX(), info.getEffector().getY(), info.getEffector().getZ(), info.getEffected().getInstanceId());
+		
+		info.getEffected().broadcastPacket(new FlyToLocation(info.getEffected(), destination, FlyType.JUMP_EFFECTED));
+		info.getEffected().setXYZ(destination);
+		info.getEffector().broadcastPacket(new ValidateLocation(info.getEffected()));
 	}
 }
diff --git a/trunk/dist/game/data/stats/skills/10000-10099.xml b/trunk/dist/game/data/stats/skills/10000-10099.xml
index 38c7e37c1c..64d6c86ded 100644
--- a/trunk/dist/game/data/stats/skills/10000-10099.xml
+++ b/trunk/dist/game/data/stats/skills/10000-10099.xml
@@ -1032,7 +1032,7 @@
 		<set name="magicLvl" val="99" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="skillType" val="BUFF" />
-		<set name="targetType" val="PARTY_MEMBER" />
+		<set name="targetType" val="PARTY" />
 		<enchant1 name="mpConsume" val="#ench1MpConsume" />
 		<cond msgId="113" addName="1">
 			<using kind="SHIELD" />
@@ -1042,14 +1042,14 @@
 				<add stat="transDamToPlayer" val="90" />
 				<!--<add stat="maxSkillDamage" val="10" />-->
 			</effect>
-			<effect name="ThrowHorizontal" noicon="1" val="0" />
+			<effect name="JumpToFriend" noicon="1" val="0" />
 		</for>
 		<enchant2for>
 			<effect name="TransferDamage" val="0">
 				<add stat="transDamToPlayer" val="90" />
 				<!--<add stat="maxSkillDamage" val="10" />-->
 			</effect>
-			<effect name="ThrowHorizontal" noicon="1" val="0" />
+			<effect name="JumpToFriend" noicon="1" val="0" />
 			<effect name="HealPercent" noicon="1" val="#ench2HpHealPercent" />
 		</enchant2for>
 	</skill>