Fix popup out index.

toxicity188 · Jan 5, 2025 · 2719c13 · 2719c13
1 parent 991713f
commit 2719c13
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/dist/src/main/kotlin/kr/toxicity/hud/popup/PopupIteratorGroupImpl.kt b/dist/src/main/kotlin/kr/toxicity/hud/popup/PopupIteratorGroupImpl.kt
@@ -72,11 +72,6 @@ class PopupIteratorGroupImpl : PopupIteratorGroup {
         if (iterator.markedAsRemoval()) {
             return false
         }
-        if (iterator.index > iterator.maxIndex) {
-            if (!iterator.canSave() || (iterator.alwaysCheckCondition() && !iterator.available())) {
-                return false
-            }
-        }
         if (iterator.index < 0 || !iterator.available()) return false
         return true
     }
@@ -88,15 +83,18 @@ class PopupIteratorGroupImpl : PopupIteratorGroup {
             var i = 0
             sourceSet.removeIf { next ->
                 i++
-                if (checkCondition(next)) {
+                (if (next.index > next.maxIndex) {
+                    !next.canSave() || (next.alwaysCheckCondition() && !next.available())
+                } else if (checkCondition(next)) {
                     result += next.next()
                     false
-                } else {
-                    next.remove()
-                    copy.subList(i, copy.size).forEach {
-                        if (it.priority < 0) it.index--
+                } else true).apply {
+                    if (this) {
+                        next.remove()
+                        copy.subList(i, copy.size).forEach {
+                            if (it.priority < 0) it.index--
+                        }
                     }
-                    true
                 }
             }
             return result