Merge remote-tracking branch 'origin/main'

KingContaria · Aug 20, 2024 · 8e3a6d3 · 8e3a6d3
2 parents d89ea79 + 78d4cb3
commit 8e3a6d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/main/java/me/contaria/seedqueue/gui/wall/SeedQueuePreview.java b/src/main/java/me/contaria/seedqueue/gui/wall/SeedQueuePreview.java
@@ -202,6 +202,10 @@ public boolean isCooldownReady() {
         return System.currentTimeMillis() - this.cooldownStart >= SeedQueue.config.resetCooldown;
     }
 
+    public void resetCooldown() {
+        this.cooldownStart = Long.MAX_VALUE;
+    }
+
     public boolean canReset(boolean ignoreLock, boolean ignoreResetCooldown) {
         return this.hasPreviewRendered() && (!this.seedQueueEntry.isLocked() || ignoreLock) && (this.isCooldownReady() || ignoreResetCooldown) && SeedQueue.selectedEntry != this.seedQueueEntry;
     }

diff --git a/src/main/java/me/contaria/seedqueue/gui/wall/SeedQueueWallScreen.java b/src/main/java/me/contaria/seedqueue/gui/wall/SeedQueueWallScreen.java
@@ -366,6 +366,7 @@ private void updateMainPreviews() {
             }
             if (this.mainPreviews[i] == null && !this.blockedMainPositions.contains(i)) {
                 this.mainPreviews[i] = this.preparingPreviews.remove(0);
+                this.mainPreviews[i].resetCooldown();
 
                 if (this.mainPreviews[i].getSeedQueueEntry().mainPosition != -1) {
                     SeedQueue.LOGGER.warn("Main preview {} already assigned a position", i);