From 130336bff0d496fd541da89f4f783b0cf39f4a64 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 23 Nov 2023 19:04:17 -0500 Subject: [PATCH] arc --- core/src/mindustry/net/ArcNetProvider.java | 2 +- core/src/mindustry/net/Net.java | 6 +++--- gradle.properties | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/net/ArcNetProvider.java b/core/src/mindustry/net/ArcNetProvider.java index 20715ecd4c..26b160526e 100644 --- a/core/src/mindustry/net/ArcNetProvider.java +++ b/core/src/mindustry/net/ArcNetProvider.java @@ -163,7 +163,7 @@ public class ArcNetProvider implements NetProvider{ } @Override - public ServerConnectFilter getConnectFilter(){ + public @Nullable ServerConnectFilter getConnectFilter(){ return server.getConnectFilter(); } diff --git a/core/src/mindustry/net/Net.java b/core/src/mindustry/net/Net.java index 17822d55ab..145238bf88 100644 --- a/core/src/mindustry/net/Net.java +++ b/core/src/mindustry/net/Net.java @@ -327,11 +327,11 @@ public class Net{ } /** Sets a connection filter by IP address. If the filter returns {@code false}, the connection will be closed. Server only. */ - public void setConnectFilter(ServerConnectFilter filter){ + public void setConnectFilter(@Nullable ServerConnectFilter filter){ provider.setConnectFilter(filter); } - public ServerConnectFilter getConnectFilter(){ + public @Nullable ServerConnectFilter getConnectFilter(){ return provider.getConnectFilter(); } @@ -412,7 +412,7 @@ public class Net{ /** Sets a connection filter by IP address. If the filter returns {@code false}, the connection will be closed. */ default void setConnectFilter(Server.ServerConnectFilter connectFilter){} - default ServerConnectFilter getConnectFilter(){ + default @Nullable ServerConnectFilter getConnectFilter(){ return null; } } diff --git a/gradle.properties b/gradle.properties index da998b39a0..5965736f20 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=96dd703d5d +archash=34775c79250cab391499fac8f4747365984c6923