Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-12-24 01:58:16 +01:00
Code Issues Projects Releases Wiki Activity

Add linear waypoint cycling

Browse Source
This commit is contained in:
fullwall 2020-06-12 19:29:28 +08:00
parent 67510c43a5
commit daa4d3cc25
1 changed files with 51 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
View File

@ -55,6 +55,8 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
@Persist
private boolean cachePaths = Setting.DEFAULT_CACHE_WAYPOINT_PATHS.asBoolean();
private LinearWaypointGoal currentGoal;
@Persist
private boolean cycle = false;
private NPC npc;
private final List<Waypoint> waypoints = Lists.newArrayList();
@ -287,6 +289,14 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
togglePath();
}
});
} else if (message.equalsIgnoreCase("cycle")) {
event.setCancelled(true);
Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
@Override
public void run() {
cycle = !cycle;
}
});
}
}
@ -394,6 +404,7 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
}
private class LinearWaypointGoal implements Goal {
private boolean ascending = true;
private final Location cachedLocation = new Location(null, 0, 0, 0);
private Waypoint currentDestination;
private Iterator<Waypoint> itr;
@ -421,24 +432,49 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
}
private Iterator<Waypoint> getUnsafeIterator() {
return new Iterator<Waypoint>() {
int idx = 0;
if (cycle && ascending) {
ascending = false;
return new Iterator<Waypoint>() {
int idx = waypoints.size() - 1;
@Override
public boolean hasNext() {
return idx < waypoints.size();
}
@Override
public boolean hasNext() {
return idx >= 0 && idx < waypoints.size();
}
@Override
public Waypoint next() {
return waypoints.get(idx++);
}
@Override
public Waypoint next() {
System.out.println(idx);
return waypoints.get(idx--);
}
@Override
public void remove() {
waypoints.remove(Math.max(0, idx - 1));
}
};
@Override
public void remove() {
waypoints.remove(Math.max(0, idx - 1));
}
};
} else {
ascending = true;
return new Iterator<Waypoint>() {
int idx = 0;
@Override
public boolean hasNext() {
return idx < waypoints.size();
}
@Override
public Waypoint next() {
System.out.println(idx);
return waypoints.get(idx++);
}
@Override
public void remove() {
waypoints.remove(Math.max(0, idx - 1));
}
};
}
}
public boolean isPaused() {