From 28374251befa10f1b908396e57ca22c5a8e3b87f Mon Sep 17 00:00:00 2001
From: vondraker <gaston_salvanescki5@hotmail.com>
Date: Wed, 18 Mar 2026 18:32:45 -0300
Subject: [PATCH] Fix: Blocked main positions now properly inherit reset
 cooldowns instead of unblocking prematurely on Reset All Instances

---
 .../seedqueue/gui/wall/SeedQueuePreview.java  |  4 +++
 .../gui/wall/SeedQueueWallScreen.java         | 27 ++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/main/java/me/contaria/seedqueue/gui/wall/SeedQueuePreview.java b/src/main/java/me/contaria/seedqueue/gui/wall/SeedQueuePreview.java
index b726b29..26b6d2a 100644
--- a/src/main/java/me/contaria/seedqueue/gui/wall/SeedQueuePreview.java
+++ b/src/main/java/me/contaria/seedqueue/gui/wall/SeedQueuePreview.java
@@ -233,6 +233,10 @@ protected void populateCooldownStart(long cooldownStart) {
         }
     }
 
+    protected long getCooldownStart() {
+        return this.cooldownStart;
+    }
+
     private boolean isCooldownReady() {
         return Util.getMeasuringTimeMs() - this.cooldownStart >= SeedQueue.config.resetCooldown;
     }
diff --git a/src/main/java/me/contaria/seedqueue/gui/wall/SeedQueueWallScreen.java b/src/main/java/me/contaria/seedqueue/gui/wall/SeedQueueWallScreen.java
index a11b8f4..0898a17 100644
--- a/src/main/java/me/contaria/seedqueue/gui/wall/SeedQueueWallScreen.java
+++ b/src/main/java/me/contaria/seedqueue/gui/wall/SeedQueueWallScreen.java
@@ -95,6 +95,7 @@ public class SeedQueueWallScreen extends Screen {
     @Nullable
     private Layout.Pos currentPos;
 
+    protected long[] positionCooldowns;
     protected long benchmarkStart;
     protected int benchmarkedSeeds;
     protected int benchmarkGoal;
@@ -114,6 +115,9 @@ public SeedQueueWallScreen() {
     protected void init() {
         this.layout = Layout.createLayout();
         this.mainPreviews = new SeedQueuePreview[this.layout.main.size()];
+        if (this.positionCooldowns == null || this.positionCooldowns.length != this.layout.main.size()) {
+            this.positionCooldowns = new long[this.layout.main.size()];
+        }
         this.lockedPreviews = this.layout.locked != null ? new ArrayList<>() : null;
         this.preparingPreviews = new ArrayList<>();
         this.lockTextures = LockTexture.createLockTextures();
@@ -743,6 +747,10 @@ private void lockInstance(SeedQueuePreview instance) {
                 int index;
                 if (!this.layout.replaceLockedInstances && (index = ArrayUtils.indexOf(this.mainPreviews, instance)) != -1) {
                     this.blockedMainPositions.add(index);
+                    if (this.positionCooldowns == null || this.positionCooldowns.length != this.layout.main.size()) {
+                        this.positionCooldowns = new long[this.layout.main.size()];
+                    }
+                    this.positionCooldowns[index] = instance.getCooldownStart();
                 }
                 if (this.removePreview(instance)) {
                     this.addLockedPreview(instance);
@@ -813,7 +821,24 @@ private void resetAllInstances() {
         for (SeedQueuePreview instance : this.mainPreviews) {
             this.resetInstance(instance, false, false, playSound);
         }
-        this.blockedMainPositions.clear();
+        
+        it.unimi.dsi.fastutil.ints.IntIterator iterator = this.blockedMainPositions.iterator();
+        while (iterator.hasNext()) {
+            int i = iterator.nextInt();
+            if (this.isPositionCooldownReady(i)) {
+                iterator.remove();
+                if (this.positionCooldowns != null) {
+                    this.positionCooldowns[i] = 0L;
+                }
+            }
+        }
+    }
+
+    private boolean isPositionCooldownReady(int index) {
+        if (this.positionCooldowns == null || this.positionCooldowns[index] == 0L || this.positionCooldowns[index] == Long.MAX_VALUE) {
+            return true;
+        }
+        return Util.getMeasuringTimeMs() - this.positionCooldowns[index] >= SeedQueue.config.resetCooldown;
     }
 
     private void focusReset(SeedQueuePreview instance) {