File tree Expand file tree Collapse file tree 2 files changed +16
-11
lines changed
src/main/java/net/modfest/eventschedule Expand file tree Collapse file tree 2 files changed +16
-11
lines changed Original file line number Diff line number Diff 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
Original file line number Diff line number Diff line change 66import net .fabricmc .api .ModInitializer ;
77import net .fabricmc .fabric .api .command .v2 .CommandRegistrationCallback ;
88import net .fabricmc .fabric .api .event .lifecycle .v1 .ServerLifecycleEvents ;
9- import net .minecraft . server . MinecraftServer ;
9+ import net .fabricmc . fabric . api . event . lifecycle . v1 . ServerTickEvents ;
1010import net .minecraft .text .Text ;
1111import net .minecraft .util .Formatting ;
1212import 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 ) {
You can’t perform that action at this time.
0 commit comments