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

Fix rightclicking markers in /npc path

Browse Source
This commit is contained in:
fullwall 2020-10-12 21:00:23 +08:00
parent 6a3382c5ce
commit 4591b9e3a9
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,10 +324,10 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
Waypoint element = new Waypoint(at); Waypoint element = new Waypoint(at);
normaliseEditingSlot(); normaliseEditingSlot();
if (editingSlot + 1 >= waypoints.size()) { if (editingSlot >= waypoints.size()) {
waypoints.add(element); waypoints.add(element);
} else { } else {
waypoints.add(editingSlot + 1, element); waypoints.add(editingSlot, element);
} }
if (showPath) { if (showPath) {
markers.createMarker(element, element.getLocation().clone().add(0, 1, 0)); markers.createMarker(element, element.getLocation().clone().add(0, 1, 0));
@ -353,9 +353,19 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
public void onPlayerInteractEntity(PlayerInteractEntityEvent event) { public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
if (!player.equals(event.getPlayer()) || !showPath || Util.isOffHand(event)) if (!player.equals(event.getPlayer()) || !showPath || Util.isOffHand(event))
return; return;
if (!event.getRightClicked().hasMetadata("waypointindex")) int slot = -1;
double minDistance = Double.MAX_VALUE;
for (int i = 0; i < waypoints.size(); i++) {
Waypoint waypoint = waypoints.get(i);
double distance = waypoint.getLocation().distanceSquared(event.getRightClicked().getLocation());
if (minDistance > distance) {
minDistance = distance;
slot = i;
}
}
if (slot == -1)
return; return;
editingSlot = event.getRightClicked().getMetadata("waypointindex").get(0).asInt(); editingSlot = slot;
Messaging.sendTr(player, Messages.LINEAR_WAYPOINT_EDITOR_EDIT_SLOT_SET, editingSlot, Messaging.sendTr(player, Messages.LINEAR_WAYPOINT_EDITOR_EDIT_SLOT_SET, editingSlot,
formatLoc(waypoints.get(editingSlot).getLocation())); formatLoc(waypoints.get(editingSlot).getLocation()));
} }