Skip to content

Commit 70bd853

Browse files
committed
Fix schedule not being ticked
1 parent 9756d2e commit 70bd853

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

src/main/java/net/modfest/eventschedule/EventSchedule.java

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,24 @@ public EventInfo get(int i) {
4545
}
4646

4747
public void update() {
48-
var time = Instant.now();
48+
try {
49+
var time = Instant.now();
4950

50-
events.removeIf(x -> x.end.isBefore(time));
51+
events.removeIf(x -> x.end.isBefore(time));
5152

52-
if (currentEvent != null && currentEvent.end.isBefore(time)) {
53-
currentEvent = null;
54-
}
53+
if (currentEvent != null && currentEvent.end.isBefore(time)) {
54+
currentEvent = null;
55+
}
5556

56-
if (currentEvent == null && !events.isEmpty()) {
57-
var event = events.getFirst();
58-
if (event.start.isBefore(time)) {
59-
currentEvent = event;
60-
events.removeFirst();
57+
if (currentEvent == null && !events.isEmpty()) {
58+
var event = events.getFirst();
59+
if (event.start.isBefore(time)) {
60+
currentEvent = event;
61+
events.removeFirst();
62+
}
6163
}
64+
} catch (Throwable e) {
65+
e.printStackTrace();
6266
}
6367
}
6468

src/main/java/net/modfest/eventschedule/ModInit.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import net.fabricmc.api.ModInitializer;
77
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
88
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
9-
import net.minecraft.server.MinecraftServer;
9+
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
1010
import net.minecraft.text.Text;
1111
import net.minecraft.util.Formatting;
1212
import net.minecraft.util.Identifier;
@@ -22,6 +22,7 @@ public void onInitialize() {
2222

2323
CommandRegistrationCallback.EVENT.register(EventSchedule::createCommands);
2424
ServerLifecycleEvents.SERVER_STARTING.register(EventSchedule::load);
25+
ServerTickEvents.END_SERVER_TICK.register(x -> EventSchedule.instance.update());
2526
}
2627

2728
private static PlaceholderResult eventInfo(PlaceholderContext placeholderContext, String s) {

0 commit comments

Comments
 (0)