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

Modernise runTriggers

This commit is contained in:
fullwall 2023-06-17 00:15:19 +08:00
parent b1b7f17861
commit 3e263bed97
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
main/src/main/java/net/citizensnpcs/trait/waypoint/Waypoint.java
View File

@ -116,21 +116,18 @@ public class Waypoint implements Locatable {
}
private void runTriggers(final NPC npc, int start) {
List<WaypointTrigger> triggers = Lists.newArrayList(this.triggers);
for (int i = start; i < triggers.size(); i++) {
WaypointTrigger trigger = triggers.get(i);
trigger.onWaypointReached(npc, location);
trigger.onWaypointReached(npc, location.clone());
if (!(trigger instanceof DelayTrigger))
continue;
int delay = ((DelayTrigger) trigger).getDelay();
if (delay <= 0)
continue;
final int newStart = i + 1;
Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
@Override
public void run() {
runTriggers(npc, newStart);
}
}, delay);
Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> runTriggers(npc, newStart),
delay);
break;
}
}