diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index a3b3adbda0..c40d1a4c01 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -3230,16 +3230,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 				m.disregardingGeodata = true;
 			}
 			
-			final double originalDistance = distance;
-			final int originalX = x;
-			final int originalY = y;
-			final int originalZ = z;
-			final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
-			final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
-			
 			// Movement checks.
 			if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
 			{
+				final double originalDistance = distance;
+				final int originalX = x;
+				final int originalY = y;
+				final int originalZ = z;
+				final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
+				final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
+				
 				if (isOnGeodataPath())
 				{
 					try
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index a3b3adbda0..c40d1a4c01 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -3230,16 +3230,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 				m.disregardingGeodata = true;
 			}
 			
-			final double originalDistance = distance;
-			final int originalX = x;
-			final int originalY = y;
-			final int originalZ = z;
-			final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
-			final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
-			
 			// Movement checks.
 			if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
 			{
+				final double originalDistance = distance;
+				final int originalX = x;
+				final int originalY = y;
+				final int originalZ = z;
+				final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
+				final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
+				
 				if (isOnGeodataPath())
 				{
 					try
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index a3b3adbda0..c40d1a4c01 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -3230,16 +3230,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 				m.disregardingGeodata = true;
 			}
 			
-			final double originalDistance = distance;
-			final int originalX = x;
-			final int originalY = y;
-			final int originalZ = z;
-			final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
-			final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
-			
 			// Movement checks.
 			if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
 			{
+				final double originalDistance = distance;
+				final int originalX = x;
+				final int originalY = y;
+				final int originalZ = z;
+				final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
+				final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
+				
 				if (isOnGeodataPath())
 				{
 					try
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index a3b3adbda0..c40d1a4c01 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -3230,16 +3230,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 				m.disregardingGeodata = true;
 			}
 			
-			final double originalDistance = distance;
-			final int originalX = x;
-			final int originalY = y;
-			final int originalZ = z;
-			final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
-			final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
-			
 			// Movement checks.
 			if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
 			{
+				final double originalDistance = distance;
+				final int originalX = x;
+				final int originalY = y;
+				final int originalZ = z;
+				final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
+				final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
+				
 				if (isOnGeodataPath())
 				{
 					try
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index a3b3adbda0..c40d1a4c01 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -3230,16 +3230,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 				m.disregardingGeodata = true;
 			}
 			
-			final double originalDistance = distance;
-			final int originalX = x;
-			final int originalY = y;
-			final int originalZ = z;
-			final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
-			final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
-			
 			// Movement checks.
 			if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
 			{
+				final double originalDistance = distance;
+				final int originalX = x;
+				final int originalY = y;
+				final int originalZ = z;
+				final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
+				final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
+				
 				if (isOnGeodataPath())
 				{
 					try
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index a3b3adbda0..c40d1a4c01 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -3230,16 +3230,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 				m.disregardingGeodata = true;
 			}
 			
-			final double originalDistance = distance;
-			final int originalX = x;
-			final int originalY = y;
-			final int originalZ = z;
-			final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
-			final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
-			
 			// Movement checks.
 			if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
 			{
+				final double originalDistance = distance;
+				final int originalX = x;
+				final int originalY = y;
+				final int originalZ = z;
+				final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
+				final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
+				
 				if (isOnGeodataPath())
 				{
 					try
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 05bd99fcce..35e4b5da0d 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -6435,16 +6435,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
 				m.disregardingGeodata = true;
 			}
 			
-			final double originalDistance = distance;
-			final int originalX = x;
-			final int originalY = y;
-			final int originalZ = z;
-			final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
-			final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
-			
 			// Movement checks.
 			if (Config.PATHFINDING > 0)
 			{
+				final double originalDistance = distance;
+				final int originalX = x;
+				final int originalY = y;
+				final int originalZ = z;
+				final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
+				final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
+				
 				if (isOnGeodataPath())
 				{
 					try
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index bc3736829f..5e254e8f3b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -4232,16 +4232,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 				m.disregardingGeodata = true;
 			}
 			
-			final double originalDistance = distance;
-			final int originalX = x;
-			final int originalY = y;
-			final int originalZ = z;
-			final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
-			final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
-			
 			// Movement checks.
 			if (Config.PATHFINDING && !(this instanceof L2QuestGuardInstance))
 			{
+				final double originalDistance = distance;
+				final int originalX = x;
+				final int originalY = y;
+				final int originalZ = z;
+				final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
+				final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
+				
 				if (isOnGeodataPath())
 				{
 					try
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index d698ff0aa2..cd52a16e2a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -3230,16 +3230,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 				m.disregardingGeodata = true;
 			}
 			
-			final double originalDistance = distance;
-			final int originalX = x;
-			final int originalY = y;
-			final int originalZ = z;
-			final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
-			final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
-			
 			// Movement checks.
 			if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
 			{
+				final double originalDistance = distance;
+				final int originalX = x;
+				final int originalY = y;
+				final int originalZ = z;
+				final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
+				final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
+				
 				if (isOnGeodataPath())
 				{
 					try
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index d698ff0aa2..cd52a16e2a 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -3230,16 +3230,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 				m.disregardingGeodata = true;
 			}
 			
-			final double originalDistance = distance;
-			final int originalX = x;
-			final int originalY = y;
-			final int originalZ = z;
-			final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
-			final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
-			
 			// Movement checks.
 			if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
 			{
+				final double originalDistance = distance;
+				final int originalX = x;
+				final int originalY = y;
+				final int originalZ = z;
+				final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
+				final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
+				
 				if (isOnGeodataPath())
 				{
 					try
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index d698ff0aa2..cd52a16e2a 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -3230,16 +3230,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 				m.disregardingGeodata = true;
 			}
 			
-			final double originalDistance = distance;
-			final int originalX = x;
-			final int originalY = y;
-			final int originalZ = z;
-			final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
-			final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
-			
 			// Movement checks.
 			if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
 			{
+				final double originalDistance = distance;
+				final int originalX = x;
+				final int originalY = y;
+				final int originalZ = z;
+				final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
+				final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
+				
 				if (isOnGeodataPath())
 				{
 					try
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index d698ff0aa2..cd52a16e2a 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -3230,16 +3230,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 				m.disregardingGeodata = true;
 			}
 			
-			final double originalDistance = distance;
-			final int originalX = x;
-			final int originalY = y;
-			final int originalZ = z;
-			final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
-			final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
-			
 			// Movement checks.
 			if (Config.PATHFINDING && !(this instanceof FriendlyNpcInstance))
 			{
+				final double originalDistance = distance;
+				final int originalX = x;
+				final int originalY = y;
+				final int originalZ = z;
+				final int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
+				final int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
+				
 				if (isOnGeodataPath())
 				{
 					try