Skip to content

Move EvtRealTime to main thread #8185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Absolutionism merged 3 commits into from
Sep 17, 2025
Merged

Move EvtRealTime to main thread #8185

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40cd8c3
move it to main thread
erenkarakal Sep 11, 2025
232ef35
Merge branch 'dev/patch' into patch/fix-evtrealtime
Absolutionism Sep 17, 2025
87cae54
Merge branch 'dev/patch' into patch/fix-evtrealtime
Absolutionism Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions src/main/java/ch/njol/skript/events/EvtRealTime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import ch.njol.skript.lang.SkriptEvent;
import ch.njol.skript.lang.SkriptParser.ParseResult;
import ch.njol.skript.util.Time;
import org.bukkit.Bukkit;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
Expand Down Expand Up @@ -82,8 +83,9 @@ public void run() {
@Override
public void unload() {
unloaded = true;
for (TimerTask task : timerTasks)
for (TimerTask task : timerTasks) {
task.cancel();
}
TIMER.purge();
}

Expand All @@ -94,14 +96,18 @@ public boolean check(Event event) {

private void execute() {
// Ensure this element wasn't unloaded
if (unloaded)
if (unloaded) {
return;
RealTimeEvent event = new RealTimeEvent();
SkriptEventHandler.logEventStart(event);
SkriptEventHandler.logTriggerStart(trigger);
trigger.execute(event);
SkriptEventHandler.logTriggerEnd(trigger);
SkriptEventHandler.logEventEnd();
}

Bukkit.getScheduler().scheduleSyncDelayedTask(Skript.getInstance(), () -> {
RealTimeEvent event = new RealTimeEvent();
SkriptEventHandler.logEventStart(event);
SkriptEventHandler.logTriggerStart(trigger);
trigger.execute(event);
SkriptEventHandler.logTriggerEnd(trigger);
SkriptEventHandler.logEventEnd();
});
}

@Override
Expand Down