Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-09-26 06:13:09 +02:00
Code Issues Projects Releases Wiki Activity

Fix some off-by-one errors

Browse Source
This commit is contained in:
fullwall 2021-01-02 20:25:29 +08:00
parent 0b1a8cc369
commit 37e6414b13
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
View File

@ -779,7 +779,7 @@ public class NPCCommands {
throw new CommandException(Messages.HOLOGRAM_INVALID_LINE);
}
int idx = Math.max(0, args.getInteger(2));
if (idx > trait.getLines().size()) {
if (idx >= trait.getLines().size()) {
throw new CommandException(Messages.HOLOGRAM_INVALID_LINE);
}
trait.removeLine(idx);

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

@ -234,10 +234,10 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
return selectedWaypoint == null ? waypoints.get(waypoints.size() - 1) : selectedWaypoint;
}
private Location getPreviousWaypoint() {
private Location getLastWaypoint() {
if (waypoints.size() <= 1)
return null;
return waypoints.get(waypoints.size() - 2).getLocation();
return waypoints.get(waypoints.size() - 1).getLocation();
}
@EventHandler
@ -312,7 +312,7 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
return;
event.setCancelled(true);
Location at = event.getClickedBlock().getLocation();
Location prev = getPreviousWaypoint();
Location prev = getLastWaypoint();
if (prev != null && prev.getWorld() == at.getWorld()) {
double distance = at.distance(prev);