Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

StraightLineTargetingStrategy should update target

This commit is contained in:
fullwall 2023-08-09 21:23:22 +08:00
parent 6ff59a1fe0
commit 47d9330a56
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
main/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java
View File

@ -220,17 +220,12 @@ public class MCTargetStrategy implements PathStrategy, EntityTarget {
@Override
public Location getCurrentDestination() {
if (active == null)
return null;
return active.getCurrentDestination();
return active == null ? null : active.getCurrentDestination();
}
@Override
public Iterable<Vector> getPath() {
if (active != null) {
return active.getPath();
}
return fallback.getPath();
return active != null ? active.getPath() : fallback.getPath();
}
@Override
@ -239,14 +234,10 @@ public class MCTargetStrategy implements PathStrategy, EntityTarget {
if (location == null)
throw new IllegalStateException("mapper should not return null");
if (parameters.straightLineTargetingDistance() > 0) {
double distance = npc.getStoredLocation().distance(location);
if (distance < parameters.straightLineTargetingDistance()) {
if (active == null) {
active = new StraightLineNavigationStrategy(npc, target, parameters);
}
return;
}
if (parameters.straightLineTargetingDistance() > 0
&& npc.getStoredLocation().distance(location) <= parameters.straightLineTargetingDistance()) {
active = new StraightLineNavigationStrategy(npc, target, parameters);
return;
}
active = null;