twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-07 15:42:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Configurable RCON IP address

Browse Source 
For servers with multiple IP's, ability to bind to a specific interface.

== AT ==
public net.minecraft.server.dedicated.Settings getStringRaw(Ljava/lang/String;)Ljava/lang/String;
This commit is contained in:
Aikar
2016-04-16 00:39:33 -04:00
parent d743b03fb6
commit b414f3d993
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
paper-server/patches/sources/net/minecraft/server/dedicated/DedicatedServerProperties.java.patch
View File

@@ -17,7 +17,7 @@
public final boolean onlineMode = this.get("online-mode", true); public final boolean onlineMode = this.get("online-mode", true);
public final boolean preventProxyConnections = this.get("prevent-proxy-connections", false); public final boolean preventProxyConnections = this.get("prevent-proxy-connections", false);
public final String serverIp = this.get("server-ip", ""); public final String serverIp = this.get("server-ip", "");
@@ -100,13 +105,15 @@ @@ -100,13 +105,17 @@
public final Settings<DedicatedServerProperties>.MutableValue<Boolean> whiteList; public final Settings<DedicatedServerProperties>.MutableValue<Boolean> whiteList;
public final boolean enforceSecureProfile; public final boolean enforceSecureProfile;
public final boolean logIPs; public final boolean logIPs;
@@ -29,6 +29,8 @@
- public DedicatedServerProperties(Properties properties) { - public DedicatedServerProperties(Properties properties) {
- super(properties); - super(properties);
+ public final String rconIp; // Paper - Configurable rcon ip
+
+ // CraftBukkit start + // CraftBukkit start
+ public DedicatedServerProperties(Properties properties, OptionSet optionset) { + public DedicatedServerProperties(Properties properties, OptionSet optionset) {
+ super(properties, optionset); + super(properties, optionset);
@@ -36,8 +38,14 @@
this.difficulty = (Difficulty) this.get("difficulty", dispatchNumberOrString(Difficulty::byId, Difficulty::byName), Difficulty::getKey, Difficulty.EASY); this.difficulty = (Difficulty) this.get("difficulty", dispatchNumberOrString(Difficulty::byId, Difficulty::byName), Difficulty::getKey, Difficulty.EASY);
this.gamemode = (GameType) this.get("gamemode", dispatchNumberOrString(GameType::byId, GameType::byName), GameType::getName, GameType.SURVIVAL); this.gamemode = (GameType) this.get("gamemode", dispatchNumberOrString(GameType::byId, GameType::byName), GameType::getName, GameType.SURVIVAL);
this.levelName = this.get("level-name", "world"); this.levelName = this.get("level-name", "world");
@@ -167,13 +174,15 @@ @@ -165,15 +174,21 @@
}, WorldPresets.NORMAL.location().toString()));
this.serverResourcePackInfo = DedicatedServerProperties.getServerPackInfo(this.get("resource-pack-id", ""), this.get("resource-pack", ""), this.get("resource-pack-sha1", ""), this.getLegacyString("resource-pack-hash"), this.get("require-resource-pack", false), this.get("resource-pack-prompt", ""));
this.initialDataPackConfiguration = DedicatedServerProperties.getDatapackConfig(this.get("initial-enabled-packs", String.join(",", WorldDataConfiguration.DEFAULT.dataPacks().getEnabled())), this.get("initial-disabled-packs", String.join(",", WorldDataConfiguration.DEFAULT.dataPacks().getDisabled()))); this.initialDataPackConfiguration = DedicatedServerProperties.getDatapackConfig(this.get("initial-enabled-packs", String.join(",", WorldDataConfiguration.DEFAULT.dataPacks().getEnabled())), this.get("initial-disabled-packs", String.join(",", WorldDataConfiguration.DEFAULT.dataPacks().getDisabled())));
+ // Paper start - Configurable rcon ip
+ final String rconIp = this.getStringRaw("rcon.ip");
+ this.rconIp = rconIp == null ? this.serverIp : rconIp;
+ // Paper end - Configurable rcon ip
} }
- public static DedicatedServerProperties fromFile(Path path) { - public static DedicatedServerProperties fromFile(Path path) {
@@ -56,7 +64,7 @@
} }
@Nullable @Nullable
@@ -254,10 +263,10 @@ @@ -254,10 +269,10 @@
}).orElseThrow(() -> { }).orElseThrow(() -> {
return new IllegalStateException("Invalid datapack contents: can't find default preset"); return new IllegalStateException("Invalid datapack contents: can't find default preset");
}); });
@@ -69,7 +77,7 @@
}); });
Objects.requireNonNull(holderlookup); Objects.requireNonNull(holderlookup);
@@ -269,7 +278,7 @@ @@ -269,7 +284,7 @@
if (holder.is(WorldPresets.FLAT)) { if (holder.is(WorldPresets.FLAT)) {
RegistryOps<JsonElement> registryops = registries.createSerializationContext(JsonOps.INSTANCE); RegistryOps<JsonElement> registryops = registries.createSerializationContext(JsonOps.INSTANCE);

11
paper-server/patches/sources/net/minecraft/server/rcon/thread/RconThread.java.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/net/minecraft/server/rcon/thread/RconThread.java
+++ b/net/minecraft/server/rcon/thread/RconThread.java
@@ -57,7 +57,7 @@
@Nullable
public static RconThread create(ServerInterface server) {
DedicatedServerProperties dedicatedServerProperties = server.getProperties();
- String string = server.getServerIp();
+ String string = dedicatedServerProperties.rconIp; // Paper - Configurable rcon ip
if (string.isEmpty()) {
string = "0.0.0.0";
}