Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-26 04:35:50 +01:00
Code Issues Projects Releases Wiki Activity

Cancel navigation once in range

Browse Source
This commit is contained in:
fullwall 2022-06-22 12:37:02 +08:00
parent bf532728d1
commit 9906c44ff3
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
main/src/main/java/net/citizensnpcs/util/AbstractBlockBreaker.java
View File

@ -35,6 +35,20 @@ public abstract class AbstractBlockBreaker extends BlockBreaker {
this.configuration = config;
}
private void cancelNavigation() {
if (setTarget) {
if (entity instanceof NPCHolder) {
NPC npc = ((NPCHolder) entity).getNPC();
if (npc != null && npc.getNavigator().isNavigating()) {
npc.getNavigator().cancelNavigation();
}
} else {
NMS.cancelMoveDestination(entity);
}
}
setTarget = false;
}
private double distance() {
return entity.getLocation().distance(Util.getCenterLocation(location.getBlock()));
}
@ -48,13 +62,7 @@ public abstract class AbstractBlockBreaker extends BlockBreaker {
@Override
public void reset() {
if (setTarget && entity instanceof NPCHolder) {
NPC npc = ((NPCHolder) entity).getNPC();
if (npc != null && npc.getNavigator().isNavigating()) {
npc.getNavigator().cancelNavigation();
}
}
setTarget = false;
cancelNavigation();
if (configuration.callback() != null) {
configuration.callback().run();
}
@ -86,8 +94,11 @@ public abstract class AbstractBlockBreaker extends BlockBreaker {
}
} else if (NMS.getDestination(entity) == null) {
NMS.setDestination(entity, x, y, z, 1);
setTarget = true;
}
return BehaviorStatus.RUNNING;
} else if (setTarget) {
cancelNavigation();
}
}
Util.faceLocation(entity, location);