Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-06-26 06:24:54 +02:00
Code Issues Projects Releases Wiki Activity

Fixed synchronization issue with pathfinder

Browse Source
This commit is contained in:
Felix Cravic 2020-08-09 05:45:26 +02:00
parent 08b4b8576e
commit dcf6bc2082
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/net/minestom/server/entity/EntityCreature.java
View File

@ -26,6 +26,7 @@ import net.minestom.server.utils.validate.Check;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.locks.ReentrantLock;
import java.util.function.Supplier;
public abstract class EntityCreature extends LivingEntity {
@ -50,6 +51,9 @@ public abstract class EntityCreature extends LivingEntity {
private ItemStack leggings;
private ItemStack boots;
// Lock used for the pathfinder
private ReentrantLock pathLock = new ReentrantLock();
public EntityCreature(EntityType entityType, Position spawnPosition) {
super(entityType, spawnPosition);
@ -115,16 +119,20 @@ public abstract class EntityCreature extends LivingEntity {
// Path finding
path = pathFinder.updatePathFor(pathingEntity);
if (path != null) {
final float speed = getAttributeValue(Attribute.MOVEMENT_SPEED);
final Position targetPosition = pathingEntity.getTargetPosition();
moveTowards(targetPosition, speed);
} else {
if (pathPosition != null) {
this.pathPosition = null;
this.pathFinder.reset();
{
pathLock.lock();
path = pathFinder.updatePathFor(pathingEntity);
if (path != null) {
final float speed = getAttributeValue(Attribute.MOVEMENT_SPEED);
final Position targetPosition = pathingEntity.getTargetPosition();
moveTowards(targetPosition, speed);
} else {
if (pathPosition != null) {
this.pathPosition = null;
this.pathFinder.reset();
}
}
pathLock.unlock();
}
super.update(time);
@ -323,7 +331,13 @@ public abstract class EntityCreature extends LivingEntity {
* @param position the position to find the path to, null to reset the pathfinder
* @return true if a path has been found
*/
public synchronized boolean setPathTo(Position position) {
public boolean setPathTo(Position position) {
if (position != null && getPathPosition() != null && position.isSimilar(getPathPosition())) {
// Tried to set path to the same target position
return false;
}
pathLock.lock();
this.pathFinder.reset();
if (position == null) {
return false;
@ -348,6 +362,7 @@ public abstract class EntityCreature extends LivingEntity {
} catch (NullPointerException | IndexOutOfBoundsException e) {
this.path = null;
}
pathLock.unlock();
final boolean success = path != null;