Modernise runTriggers
This commit is contained in:
parent
b1b7f17861
commit
3e263bed97
|
@ -116,21 +116,18 @@ public class Waypoint implements Locatable {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void runTriggers(final NPC npc, int start) {
|
private void runTriggers(final NPC npc, int start) {
|
||||||
|
List<WaypointTrigger> triggers = Lists.newArrayList(this.triggers);
|
||||||
for (int i = start; i < triggers.size(); i++) {
|
for (int i = start; i < triggers.size(); i++) {
|
||||||
WaypointTrigger trigger = triggers.get(i);
|
WaypointTrigger trigger = triggers.get(i);
|
||||||
trigger.onWaypointReached(npc, location);
|
trigger.onWaypointReached(npc, location.clone());
|
||||||
if (!(trigger instanceof DelayTrigger))
|
if (!(trigger instanceof DelayTrigger))
|
||||||
continue;
|
continue;
|
||||||
int delay = ((DelayTrigger) trigger).getDelay();
|
int delay = ((DelayTrigger) trigger).getDelay();
|
||||||
if (delay <= 0)
|
if (delay <= 0)
|
||||||
continue;
|
continue;
|
||||||
final int newStart = i + 1;
|
final int newStart = i + 1;
|
||||||
Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
|
Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> runTriggers(npc, newStart),
|
||||||
@Override
|
delay);
|
||||||
public void run() {
|
|
||||||
runTriggers(npc, newStart);
|
|
||||||
}
|
|
||||||
}, delay);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue