Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix skipping over pingers #1086

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix skipping over pingers #1086

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ private void updatePingers(ArrayList<WurstServerPinger> pingers)
}
}
pingers.remove(i);
i -= 1;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Consider using removeIf for safer collection modification

While the fix correctly handles the index adjustment after removal, modifying collections during iteration is generally discouraged. Consider refactoring to use removeIf for a cleaner and safer implementation:

 private void updatePingers(ArrayList<WurstServerPinger> pingers)
 {
-    for(int i = 0; i < pingers.size(); i++)
-        if(!pingers.get(i).isStillPinging())
-        {
-            checked++;
-            if(pingers.get(i).isWorking())
-            {
-                working++;
-                
-                if(!isServerInList(pingers.get(i).getServerIP()))
-                {
-                    prevScreen.getServerList()
-                        .add(new ServerInfo("Grief me #" + working,
-                            pingers.get(i).getServerIP(), ServerType.OTHER),
-                            false);
-                    prevScreen.getServerList().saveFile();
-                    ((IMultiplayerScreen)prevScreen).getServerListSelector()
-                        .setSelected(null);
-                    ((IMultiplayerScreen)prevScreen).getServerListSelector()
-                        .setServers(prevScreen.getServerList());
-                }
-            }
-            pingers.remove(i);
-            i -= 1;
-        }
+    pingers.removeIf(pinger -> {
+        if (!pinger.isStillPinging()) {
+            checked++;
+            if (pinger.isWorking()) {
+                working++;
+                if (!isServerInList(pinger.getServerIP())) {
+                    prevScreen.getServerList()
+                        .add(new ServerInfo("Grief me #" + working,
+                            pinger.getServerIP(), ServerType.OTHER),
+                            false);
+                    prevScreen.getServerList().saveFile();
+                    ((IMultiplayerScreen)prevScreen).getServerListSelector()
+                        .setSelected(null);
+                    ((IMultiplayerScreen)prevScreen).getServerListSelector()
+                        .setServers(prevScreen.getServerList());
+                }
+            }
+            return true;
+        }
+        return false;
+    });
 }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
i -= 1;
private void updatePingers(ArrayList<WurstServerPinger> pingers)
{
pingers.removeIf(pinger -> {
if (!pinger.isStillPinging()) {
checked++;
if (pinger.isWorking()) {
working++;
if (!isServerInList(pinger.getServerIP())) {
prevScreen.getServerList()
.add(new ServerInfo("Grief me #" + working,
pinger.getServerIP(), ServerType.OTHER),
false);
prevScreen.getServerList().saveFile();
((IMultiplayerScreen)prevScreen).getServerListSelector()
.setSelected(null);
((IMultiplayerScreen)prevScreen).getServerListSelector()
.setServers(prevScreen.getServerList());
}
}
return true;
}
return false;
});
}

}
}

Expand Down