geforkt von Mirrors/Paper
48 Zeilen
3.0 KiB
Diff
48 Zeilen
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
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.
|
|
|
|
== AT ==
|
|
public net.minecraft.server.dedicated.Settings getStringRaw(Ljava/lang/String;)Ljava/lang/String;
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
|
|
index 666dc4b22569e1ae26ff988c7d4ac1113acd32f3..e72fb5c548a9baef09ae547863c4bdc439ce28b2 100644
|
|
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
|
|
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
|
|
@@ -108,6 +108,8 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
|
|
private final DedicatedServerProperties.WorldDimensionData worldDimensionData;
|
|
public final WorldOptions worldOptions;
|
|
|
|
+ public final String rconIp; // Paper - Add rcon ip
|
|
+
|
|
// CraftBukkit start
|
|
public DedicatedServerProperties(Properties properties, OptionSet optionset) {
|
|
super(properties, optionset);
|
|
@@ -165,6 +167,10 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
|
|
}, WorldPresets.NORMAL.location().toString()));
|
|
this.serverResourcePackInfo = DedicatedServerProperties.getServerPackInfo(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())));
|
|
+ // Paper start - Configurable rcon ip
|
|
+ final String rconIp = this.getStringRaw("rcon.ip");
|
|
+ this.rconIp = rconIp == null ? this.serverIp : rconIp;
|
|
+ // Paper end
|
|
}
|
|
|
|
// CraftBukkit start
|
|
diff --git a/src/main/java/net/minecraft/server/rcon/thread/RconThread.java b/src/main/java/net/minecraft/server/rcon/thread/RconThread.java
|
|
index cb61eaf8447c8340c4b4e1079c0a6aecd41a6116..3bf60f640aa9fa4cabd2b3e5d3931e8467b9df24 100644
|
|
--- a/src/main/java/net/minecraft/server/rcon/thread/RconThread.java
|
|
+++ b/src/main/java/net/minecraft/server/rcon/thread/RconThread.java
|
|
@@ -60,7 +60,7 @@ public class RconThread extends GenericThread {
|
|
@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";
|
|
}
|