From cda82e572f480ab0526d0d51fbed110c6875fc03 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 3 Jun 2023 12:38:18 -0400 Subject: [PATCH] ServerConnectFilter --- core/src/mindustry/net/ArcNetProvider.java | 5 +++++ core/src/mindustry/net/Net.java | 3 +++ gradle.properties | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/net/ArcNetProvider.java b/core/src/mindustry/net/ArcNetProvider.java index 222a97baa0..87a16f6a52 100644 --- a/core/src/mindustry/net/ArcNetProvider.java +++ b/core/src/mindustry/net/ArcNetProvider.java @@ -156,6 +156,11 @@ public class ArcNetProvider implements NetProvider{ }); } + @Override + public void setConnectFilter(Server.ServerConnectFilter connectFilter){ + server.setConnectFilter(connectFilter); + } + private static boolean isLocal(InetAddress addr){ if(addr.isAnyLocalAddress() || addr.isLoopbackAddress()) return true; diff --git a/core/src/mindustry/net/Net.java b/core/src/mindustry/net/Net.java index b04c2db7ac..c49a74642e 100644 --- a/core/src/mindustry/net/Net.java +++ b/core/src/mindustry/net/Net.java @@ -398,5 +398,8 @@ public class Net{ disconnectClient(); closeServer(); } + + /** If a connecting ip doesn't match the filter it will be kicked. */ + void setConnectFilter(Server.ServerConnectFilter connectFilter); } } diff --git a/gradle.properties b/gradle.properties index 194354292b..51145a1415 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,4 +25,4 @@ org.gradle.caching=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=791c5fa502 +archash=10233fcd0f