lionarius/SkinRestorer
1
0
Fork 0
mirror of https://github.com/Suiranoil/SkinRestorer.git synced 2026-01-16 04:42:12 +00:00
Code Wiki Activity

make TickedScheduler track task id and schedule time

Browse Source
This commit is contained in:
Lionarius
2025-03-27 18:25:27 +03:00
parent cec5bac608
commit 364ca540be
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java
View File

@@ -50,7 +50,7 @@ public abstract class PlayerListMixin {
var actualPlayer = server.getPlayerList().getPlayer(uuid);
if (actualPlayer != null)
skinrestorer$tryApplySkin(server, actualPlayer);
}, delay);
}, delay, uuid);
}
}

26
common/src/main/java/net/lionarius/skinrestorer/util/TickedScheduler.java
View File

@@ -4,36 +4,52 @@ import com.google.common.collect.Queues;
import net.minecraft.server.MinecraftServer;
import org.jetbrains.annotations.NotNull;
import java.util.Map;
import java.util.Queue;
import java.util.concurrent.ConcurrentHashMap;
public class TickedScheduler implements Runnable {
private final MinecraftServer server;
private final Queue<TickTask> queue = Queues.newPriorityBlockingQueue();
private final Map<Integer, Integer> idMap = new ConcurrentHashMap<>();
public TickedScheduler(MinecraftServer server) {
this.server = server;
}
public void schedule(Runnable task, int delay) {
this.queue.add(new TickTask(this.server.getTickCount() + delay, task));
this.schedule(task, delay, task);
}
public void schedule(Runnable task, int delay, Object id) {
var taskId = id.hashCode();
var serverTick = this.server.getTickCount();
this.idMap.merge(taskId, serverTick, Integer::max);
this.queue.add(new TickTask(serverTick, serverTick + delay, taskId, task));
}
@Override
public void run() {
TickTask nextTask;
while ((nextTask = this.queue.peek()) != null) {
if (nextTask.tick() > this.server.getTickCount())
if (nextTask.runOnTick() > this.server.getTickCount())
break;
var tickTask = this.queue.remove();
tickTask.task().run();
var lastTaskScheduledOnTick = this.idMap.get(tickTask.id());
if (lastTaskScheduledOnTick != null && lastTaskScheduledOnTick <= tickTask.scheduledOnTick()) {
this.idMap.remove(tickTask.id());
if (tickTask.task() != null)
tickTask.task().run();
}
}
}
private record TickTask(int tick, Runnable task) implements Comparable<TickTask> {
private record TickTask(int scheduledOnTick, int runOnTick, int id, Runnable task) implements Comparable<TickTask> {
@Override
public int compareTo(@NotNull TickedScheduler.TickTask other) {
return Integer.compare(this.tick, other.tick);
return Integer.compare(this.runOnTick, other.runOnTick);
}
}
}