From 46483713837a481b32068264d29f90c9a6bd4038 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 11 Jan 2025 21:32:44 -0500 Subject: [PATCH] iOS ping crash fix --- core/src/mindustry/net/Net.java | 5 ++++- gradle.properties | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/net/Net.java b/core/src/mindustry/net/Net.java index 145238bf88..a5c319220e 100644 --- a/core/src/mindustry/net/Net.java +++ b/core/src/mindustry/net/Net.java @@ -35,7 +35,10 @@ public class Net{ private final ObjectMap, Cons> clientListeners = new ObjectMap<>(); private final ObjectMap, Cons2> serverListeners = new ObjectMap<>(); private final IntMap streams = new IntMap<>(); - private final ExecutorService pingExecutor = OS.isWindows && !OS.is64Bit ? Threads.boundedExecutor("Ping Servers", 5) : Threads.unboundedExecutor(); + private final ExecutorService pingExecutor = + OS.isWindows && !OS.is64Bit ? Threads.boundedExecutor("Ping Servers", 5) : //on 32-bit windows, thread spam crashes + OS.isIos ? Threads.boundedExecutor("Ping Servers", 32) : //on IOS, 256 threads can crash, so limit the amount + Threads.unboundedExecutor(); private final NetProvider provider; diff --git a/gradle.properties b/gradle.properties index 68c4b0c8f4..c0897d5b42 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,4 +26,4 @@ org.gradle.caching=true org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 android.enableR8.fullMode=false -archash=d631900a9e +archash=9dd4c1ee65