Tempfix for vehicle path issues.

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java

@@ -219,7 +219,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 			player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_A_PET_OR_A_SERVITOR_IS_SUMMONED);
 			return null;
 		}
-		else if (_ship.isInDock() && _ship.isInsideRadius3D(player, 600))
+		else if (_ship.isInDock() && World.getInstance().getVisibleObjects(player, AirShipInstance.class).contains(_ship))
 		{
 			_ship.addPassenger(player);
 		}

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -55,6 +56,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	public Vehicle(CreatureTemplate template)
 	{
@@ -129,6 +132,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -159,12 +167,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_02.5_Underground/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java

@@ -219,7 +219,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 			player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_A_PET_OR_A_SERVITOR_IS_SUMMONED);
 			return null;
 		}
-		else if (_ship.isInDock() && _ship.isInsideRadius3D(player, 600))
+		else if (_ship.isInDock() && World.getInstance().getVisibleObjects(player, AirShipInstance.class).contains(_ship))
 		{
 			_ship.addPassenger(player);
 		}

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -55,6 +56,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	public Vehicle(CreatureTemplate template)
 	{
@@ -129,6 +132,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -159,12 +167,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_03.0_Helios/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java

@@ -219,7 +219,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 			player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_A_PET_OR_A_SERVITOR_IS_SUMMONED);
 			return null;
 		}
-		else if (_ship.isInDock() && _ship.isInsideRadius3D(player, 600))
+		else if (_ship.isInDock() && World.getInstance().getVisibleObjects(player, AirShipInstance.class).contains(_ship))
 		{
 			_ship.addPassenger(player);
 		}

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -55,6 +56,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	public Vehicle(CreatureTemplate template)
 	{
@@ -129,6 +132,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -159,12 +167,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java

@@ -219,7 +219,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 			player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_A_PET_OR_A_SERVITOR_IS_SUMMONED);
 			return null;
 		}
-		else if (_ship.isInDock() && _ship.isInsideRadius3D(player, 600))
+		else if (_ship.isInDock() && World.getInstance().getVisibleObjects(player, AirShipInstance.class).contains(_ship))
 		{
 			_ship.addPassenger(player);
 		}

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -55,6 +56,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	public Vehicle(CreatureTemplate template)
 	{
@@ -129,6 +132,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -159,12 +167,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java

@@ -219,7 +219,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 			player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_A_PET_OR_A_SERVITOR_IS_SUMMONED);
 			return null;
 		}
-		else if (_ship.isInDock() && _ship.isInsideRadius3D(player, 600))
+		else if (_ship.isInDock() && World.getInstance().getVisibleObjects(player, AirShipInstance.class).contains(_ship))
 		{
 			_ship.addPassenger(player);
 		}

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -55,6 +56,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	public Vehicle(CreatureTemplate template)
 	{
@@ -129,6 +132,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -159,12 +167,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java

@@ -219,7 +219,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 			player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_A_PET_OR_A_SERVITOR_IS_SUMMONED);
 			return null;
 		}
-		else if (_ship.isInDock() && _ship.isInsideRadius3D(player, 600))
+		else if (_ship.isInDock() && World.getInstance().getVisibleObjects(player, AirShipInstance.class).contains(_ship))
 		{
 			_ship.addPassenger(player);
 		}

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -55,6 +56,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	public Vehicle(CreatureTemplate template)
 	{
@@ -129,6 +132,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -159,12 +167,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java

@@ -219,7 +219,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 			player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_A_PET_OR_A_SERVITOR_IS_SUMMONED);
 			return null;
 		}
-		else if (_ship.isInDock() && _ship.isInsideRadius3D(player, 600))
+		else if (_ship.isInDock() && World.getInstance().getVisibleObjects(player, AirShipInstance.class).contains(_ship))
 		{
 			_ship.addPassenger(player);
 		}

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -55,6 +56,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	public Vehicle(CreatureTemplate template)
 	{
@@ -129,6 +132,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -159,12 +167,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java

@@ -219,7 +219,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 			player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_A_PET_OR_A_SERVITOR_IS_SUMMONED);
 			return null;
 		}
-		else if (_ship.isInDock() && _ship.isInsideRadius3D(player, 600))
+		else if (_ship.isInDock() && World.getInstance().getVisibleObjects(player, AirShipInstance.class).contains(_ship))
 		{
 			_ship.addPassenger(player);
 		}

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -55,6 +56,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	public Vehicle(CreatureTemplate template)
 	{
@@ -129,6 +132,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -159,12 +167,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java

@@ -219,7 +219,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 			player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_A_PET_OR_A_SERVITOR_IS_SUMMONED);
 			return null;
 		}
-		else if (_ship.isInDock() && _ship.isInsideRadius3D(player, 600))
+		else if (_ship.isInDock() && World.getInstance().getVisibleObjects(player, AirShipInstance.class).contains(_ship))
 		{
 			_ship.addPassenger(player);
 		}

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -55,6 +56,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	public Vehicle(CreatureTemplate template)
 	{
@@ -129,6 +132,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -159,12 +167,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java

@@ -219,7 +219,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 			player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_A_PET_OR_A_SERVITOR_IS_SUMMONED);
 			return null;
 		}
-		else if (_ship.isInDock() && _ship.isInsideRadius3D(player, 600))
+		else if (_ship.isInDock() && World.getInstance().getVisibleObjects(player, AirShipInstance.class).contains(_ship))
 		{
 			_ship.addPassenger(player);
 		}

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -55,6 +56,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	public Vehicle(CreatureTemplate template)
 	{
@@ -129,6 +132,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -159,12 +167,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java

@@ -219,7 +219,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 			player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_A_PET_OR_A_SERVITOR_IS_SUMMONED);
 			return null;
 		}
-		else if (_ship.isInDock() && _ship.isInsideRadius3D(player, 600))
+		else if (_ship.isInDock() && World.getInstance().getVisibleObjects(player, AirShipInstance.class).contains(_ship))
 		{
 			_ship.addPassenger(player);
 		}

L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -55,6 +56,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	public Vehicle(CreatureTemplate template)
 	{
@@ -129,6 +132,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -159,12 +167,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java

@@ -219,7 +219,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 			player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_A_PET_OR_A_SERVITOR_IS_SUMMONED);
 			return null;
 		}
-		else if (_ship.isInDock() && _ship.isInsideRadius3D(player, 600))
+		else if (_ship.isInDock() && World.getInstance().getVisibleObjects(player, AirShipInstance.class).contains(_ship))
 		{
 			_ship.addPassenger(player);
 		}

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.model.actor;
 
 import java.util.Collection;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -54,6 +55,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	/**
 	 * Creates an abstract vehicle.
@@ -132,6 +135,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -162,12 +170,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java

@@ -219,7 +219,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 			player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_A_PET_OR_A_SERVITOR_IS_SUMMONED);
 			return null;
 		}
-		else if (_ship.isInDock() && _ship.isInsideRadius3D(player, 600))
+		else if (_ship.isInDock() && World.getInstance().getVisibleObjects(player, AirShipInstance.class).contains(_ship))
 		{
 			_ship.addPassenger(player);
 		}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.model.actor;
 
 import java.util.Collection;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -54,6 +55,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	/**
 	 * Creates an abstract vehicle.
@@ -132,6 +135,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -162,12 +170,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -55,6 +56,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	public Vehicle(CreatureTemplate template)
 	{
@@ -129,6 +132,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -159,12 +167,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -55,6 +56,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	public Vehicle(CreatureTemplate template)
 	{
@@ -129,6 +132,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -159,12 +167,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -55,6 +56,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	public Vehicle(CreatureTemplate template)
 	{
@@ -129,6 +132,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -159,12 +167,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -55,6 +56,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	public Vehicle(CreatureTemplate template)
 	{
@@ -129,6 +132,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -159,12 +167,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -55,6 +56,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	public Vehicle(CreatureTemplate template)
 	{
@@ -129,6 +132,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -159,12 +167,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -55,6 +56,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	public Vehicle(CreatureTemplate template)
 	{
@@ -129,6 +132,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -159,12 +167,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -55,6 +56,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	public Vehicle(CreatureTemplate template)
 	{
@@ -129,6 +132,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -159,12 +167,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -55,6 +56,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	public Vehicle(CreatureTemplate template)
 	{
@@ -129,6 +132,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -159,12 +167,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -55,6 +56,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	public Vehicle(CreatureTemplate template)
 	{
@@ -129,6 +132,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -159,12 +167,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}

L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Vehicle.java

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Level;
 
 import org.l2jmobius.commons.threads.ThreadPool;
@@ -55,6 +56,8 @@ public abstract class Vehicle extends Creature
 	
 	protected VehiclePathPoint[] _currentPath = null;
 	protected int _runState = 0;
+	private ScheduledFuture<?> _monitorTask = null;
+	private final Location _monitorLocation = new Location(this);
 	
 	public Vehicle(CreatureTemplate template)
 	{
@@ -129,6 +132,11 @@ public abstract class Vehicle extends Creature
 					{
 						point.setHeading(point.getRotationSpeed());
 						teleToLocation(point, false);
+						if (_monitorTask != null)
+						{
+							_monitorTask.cancel(true);
+							_monitorTask = null;
+						}
 						_currentPath = null;
 					}
 					else
@@ -159,12 +167,44 @@ public abstract class Vehicle extends Creature
 						m._moveStartTime = GameTimeTaskManager.getInstance().getGameTicks();
 						_move = m;
 						GameTimeTaskManager.getInstance().registerMovingObject(this);
+						
+						// Make sure vehicle is not stuck.
+						if (_monitorTask == null)
+						{
+							_monitorTask = ThreadPool.scheduleAtFixedRate(() ->
+							{
+								if (!isInDock() && (calculateDistance3D(_monitorLocation) == 0))
+								{
+									if (_currentPath != null)
+									{
+										if (_runState < _currentPath.length)
+										{
+											moveToNextRoutePoint();
+										}
+										else
+										{
+											broadcastInfo();
+										}
+									}
+								}
+								else
+								{
+									_monitorLocation.setXYZ(this);
+								}
+							}, 1000, 1000);
+						}
+						
 						return true;
 					}
 				}
 			}
 			else
 			{
+				if (_monitorTask != null)
+				{
+					_monitorTask.cancel(true);
+					_monitorTask = null;
+				}
 				_currentPath = null;
 			}
 		}