fix: solve an infinite update loop that consumes a core

emortalmc · Oct 17, 2024 · 967cf6e · 967cf6e
1 parent 4f505ad
commit 967cf6e
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/main/java/dev/emortal/minestom/gamesdk/internal/GameTracker.java b/src/main/java/dev/emortal/minestom/gamesdk/internal/GameTracker.java
@@ -60,11 +60,12 @@ public GameTracker(@NotNull MessagingModule messagingModule, @NotNull GameSdkCon
 
     private void maxTimeUpdate(@NotNull Game game) {
         long nextExpectedUpdate = game.getLastGameTrackerUpdate() + (this.config.maxTrackingInterval() * 1000L);
-        if (nextExpectedUpdate < System.currentTimeMillis()) {
+        long timeUntilNextUpdate = nextExpectedUpdate - System.currentTimeMillis();
+        if (timeUntilNextUpdate > 0) {
             // Game has been updated in the meantime, let's reschedule this task
             this.gameMaxTimeUpdateTasks.put(game, SCHEDULER.schedule(() -> {
                 this.maxTimeUpdate(game);
-            }, nextExpectedUpdate - System.currentTimeMillis(), TimeUnit.MILLISECONDS));
+            }, timeUntilNextUpdate + 10, TimeUnit.MILLISECONDS));
             return;
         }
 
@@ -119,10 +120,10 @@ private void onGameUpdateRequest(@NotNull GameUpdateRequestEvent event) {
             // Game was updated too recently, queue an update if it isn't already queued
 
             // Schedule an update for the next interval
-            SCHEDULER.schedule(() -> {
-                game.markTrackerUpdated();
-                this.updateGame(game);
-            }, minNextUpdate - System.currentTimeMillis(), TimeUnit.MILLISECONDS);
+            SCHEDULER.schedule(
+                    () -> this.updateGame(game),
+                    minNextUpdate - System.currentTimeMillis(),
+                    TimeUnit.MILLISECONDS);
             return;
         }