From dea137fe48a95318ce95d64011cd22b6f4db5ab9 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Sat, 5 Dec 2020 00:35:09 +0100
Subject: [PATCH] Bugfix in plugin manager returning disabled plugins

---
 src/zutil/plugin/PluginManager.java | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/zutil/plugin/PluginManager.java b/src/zutil/plugin/PluginManager.java
index d65d984..6ab7583 100755
--- a/src/zutil/plugin/PluginManager.java
+++ b/src/zutil/plugin/PluginManager.java
@@ -182,19 +182,25 @@ public class PluginManager<T> implements Iterable<PluginData>{
             this.pluginList = pluginList;
         }
 
-        @Override
-        public boolean hasNext() {
+        public int getNextIndex() {
             for (int i = nextIndex; i < pluginList.size(); i++) {
                 if (pluginList.get(i).isEnabled())
-                    return true;
+                    return i;
             }
-            return false;
+            return -1;
+        }
+
+        @Override
+        public boolean hasNext() {
+            return getNextIndex() >= 0;
         }
 
         @Override
         public PluginData next() {
-            if(!hasNext())
+            nextIndex = getNextIndex();
+            if(nextIndex < 0)
                 throw new NoSuchElementException();
+
             return pluginList.get(nextIndex++);
         }
     }