From ed4156850b7c80bd2c3e20f038a9501e5a6f5a85 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 3 Jul 2021 23:21:29 -0400
Subject: [PATCH] Cached ping executor

---
 core/src/mindustry/net/Net.java               | 9 +--------
 core/src/mindustry/ui/dialogs/JoinDialog.java | 2 +-
 gradle.properties                             | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/core/src/mindustry/net/Net.java b/core/src/mindustry/net/Net.java
index 7247f665ad..fe2c4cc12e 100644
--- a/core/src/mindustry/net/Net.java
+++ b/core/src/mindustry/net/Net.java
@@ -34,7 +34,7 @@ public class Net{
     private final ObjectMap<Class<?>, Cons> clientListeners = new ObjectMap<>();
     private final ObjectMap<Class<?>, Cons2<NetConnection, Object>> serverListeners = new ObjectMap<>();
     private final IntMap<StreamBuilder> streams = new IntMap<>();
-    private final ExecutorService pingExecutor = Threads.executor(Math.max(Runtime.getRuntime().availableProcessors(), 6));
+    private final ExecutorService pingExecutor = Threads.cachedExecutor();
 
     private final NetProvider provider;
 
@@ -326,13 +326,6 @@ public class Net{
         pingExecutor.submit(() -> provider.pingHost(address, port, valid, failed));
     }
 
-    /**
-     * Pings a host in an new thread. If an error occurred, failed() should be called with the exception.
-     */
-    public void pingHostThread(String address, int port, Cons<Host> valid, Cons<Exception> failed){
-        Threads.daemon(() -> provider.pingHost(address, port, valid, failed));
-    }
-
     /**
      * Whether the net is active, e.g. whether this is a multiplayer game.
      */
diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java
index 9aa3db068c..0abd41a959 100644
--- a/core/src/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/mindustry/ui/dialogs/JoinDialog.java
@@ -375,7 +375,7 @@ public class JoinDialog extends BaseDialog{
             for(String address : group.addresses){
                 String resaddress = address.contains(":") ? address.split(":")[0] : address;
                 int resport = address.contains(":") ? Strings.parseInt(address.split(":")[1]) : port;
-                net.pingHostThread(resaddress, resport, res -> {
+                net.pingHost(resaddress, resport, res -> {
                     if(refreshes != cur) return;
                     res.port = resport;
 
diff --git a/gradle.properties b/gradle.properties
index bf99697a47..cd18c70c04 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,4 +10,4 @@ kapt.include.compile.classpath=false
 kotlin.stdlib.default.dependency=false
 #needed for android compilation
 android.useAndroidX=true
-archash=41de08d2d3c2f415e1965b66cf9aab3c9950477d
+archash=b5d3986d159cc42f2b38da24682ad0cc19c6c656