From ee7d5d106982a5476dcd5f899b0ae62dd576b057 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 16 Apr 2016 00:39:33 -0400 Subject: [PATCH] Configurable RCON IP address For servers with multiple IP's, ability to bind to a specific interface. diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java index ad1e3508a..0c3ec8357 100644 --- a/src/main/java/net/minecraft/server/DedicatedServerProperties.java +++ b/src/main/java/net/minecraft/server/DedicatedServerProperties.java @@ -54,6 +54,8 @@ public class DedicatedServerProperties extends PropertyManager.EditableProperty playerIdleTimeout; public final PropertyManager.EditableProperty whiteList; + public final String rconIp; // Paper - Add rcon ip + // CraftBukkit start public DedicatedServerProperties(Properties properties, OptionSet optionset) { super(properties, optionset); @@ -100,6 +102,10 @@ public class DedicatedServerProperties extends PropertyManager> { }; } - @Nullable - private String c(String s) { + @Nullable String getSettingIfExists(final String path) { return this.c(path); } // Paper - OBFHELPER + @Nullable private String c(String s) { // Paper - OBFHELPER return (String) getOverride(s, this.properties.getProperty(s)); // CraftBukkit } diff --git a/src/main/java/net/minecraft/server/RemoteControlListener.java b/src/main/java/net/minecraft/server/RemoteControlListener.java index e48d6dcd7..2ce490be0 100644 --- a/src/main/java/net/minecraft/server/RemoteControlListener.java +++ b/src/main/java/net/minecraft/server/RemoteControlListener.java @@ -25,7 +25,7 @@ public class RemoteControlListener extends RemoteConnectionThread { this.h = dedicatedserverproperties.rconPort; this.k = dedicatedserverproperties.rconPassword; - this.i = iminecraftserver.e_(); + this.i = dedicatedserverproperties.rconIp; // Paper - Configurable rcon ip if (this.i.isEmpty()) { this.i = "0.0.0.0"; } -- 2.24.0