wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move overrides in LAN to config

Browse Source
This commit is contained in:
s809
2024-05-18 22:09:19 +05:00
parent e6b140245b
commit 96755e6174
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/config/Config.java
+9
View File
@@ -917,6 +917,15 @@ public class Config
+ "Set to 0 to use port from serverPort.\n"
+ "")
.build();
public static ConfigEntry<Boolean> enableConnectOverridesInLan = new ConfigEntry.Builder<Boolean>()
.setServersideShortName("enableConnectOverridesInLan")
.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE)
.set(false)
.comment(""
+ "Controls whether the connect overrides are sent to the clients originating from LAN. \n"
+ "Unless you have a good reason to do otherwise, leave this disabled. \n"
+ "")
.build();
public static ConfigEntry<Integer> rateLimitHitTolerance = new ConfigEntry.Builder<Integer>()
.setServersideShortName("rateLimitHitTolerance")
core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/ServerPlayerState.java
+1 -6
View File
@@ -17,7 +17,6 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapp
import org.apache.logging.log4j.LogManager;
import org.jetbrains.annotations.NotNull;
import java.io.Closeable;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.concurrent.ConcurrentHashMap;
@@ -26,8 +25,6 @@ import static com.seibel.distanthorizons.core.config.Config.Client.Advanced.Mult
public class ServerPlayerState
{
private static final boolean DEBUG_ENABLE_OVERRIDES_IN_LAN = false;
private static final ConfigBasedLogger LOGGER = new ConfigBasedLogger(LogManager.getLogger(),
() -> Config.Client.Advanced.Logging.logNetworkEvent.get());
@@ -74,10 +71,8 @@ public class ServerPlayerState
String ipOverride = ServerNetworking.connectIpOverride.get();
int portOverride = ServerNetworking.connectPortOverride.get();
// IP/port overrides are intended for using with port forwarding services,
// and LAN clients are unlikely to need to hop through internet
InetAddress ip = ((InetSocketAddress) this.serverPlayer.getRemoteAddress()).getAddress();
boolean isLanPlayer = !DEBUG_ENABLE_OVERRIDES_IN_LAN && (ip.isLinkLocalAddress() || ip.isSiteLocalAddress());
boolean isLanPlayer = !ServerNetworking.enableConnectOverridesInLan.get() && (ip.isLinkLocalAddress() || ip.isSiteLocalAddress());
this.pluginChannelHandler.sendMessageServer(this.serverPlayer, new ServerConnectInfoMessage(
!isLanPlayer && !ipOverride.isEmpty() ? ipOverride : null,