diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index 2a5e73b1a3..358e0322b7 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -874,7 +874,7 @@ public class NetServer implements ApplicationListener{ net.host(Config.port.num()); info("Opened a server on port @.", Config.port.num()); }catch(BindException e){ - err("Unable to host: Port already in use! Make sure no other servers are running on the same port in your network."); + err("Unable to host: Port " + Config.port.num() + " already in use! Make sure no other servers are running on the same port in your network."); state.set(State.menu); }catch(IOException e){ err(e); diff --git a/core/src/mindustry/net/NetConnection.java b/core/src/mindustry/net/NetConnection.java index 09929ec27f..eb43dc84f1 100644 --- a/core/src/mindustry/net/NetConnection.java +++ b/core/src/mindustry/net/NetConnection.java @@ -57,7 +57,7 @@ public abstract class NetConnection{ } /** Kick with an arbitrary reason, and a kick duration in milliseconds. */ - private void kick(String reason, KickReason kickType, long kickDuration){ + private void kick(String reason, @Nullable KickReason kickType, long kickDuration){ if(kicked) return; Log.info("Kicking connection @ / @; Reason: @", address, uuid, reason == null ? kickType.name() : reason.replace("\n", " ")); diff --git a/gradle.properties b/gradle.properties index ec5aed110a..e1dd9f2cec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ android.useAndroidX=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=5402a17620 +archash=3bd873b8b7