lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tempfix for vehicle path issues.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-11-13 22:29:41 +00:00
parent b4def6ab92
commit b0e918e4fe
36 changed files with 933 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Vehicle.java
View File

@ -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;
}
}