mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 23:38:25 +01:00
062733b903
Doesn't compile yet. CraftBukkit Changes: 90d6905b Repackage NMS 69cf961d Repackage patches Spigot Changes: 79d53c28 Repackage NMS
59 lines
3.4 KiB
Diff
59 lines
3.4 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.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
|
|
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
|
|
@@ -0,0 +0,0 @@ public class DedicatedServerProperties extends PropertyManager<DedicatedServerPr
|
|
public final PropertyManager<DedicatedServerProperties>.EditableProperty<Boolean> whiteList;
|
|
public final GeneratorSettings generatorSettings;
|
|
|
|
+ public final String rconIp; // Paper - Add rcon ip
|
|
+
|
|
// CraftBukkit start
|
|
public DedicatedServerProperties(Properties properties, IRegistryCustom iregistrycustom, OptionSet optionset) {
|
|
super(properties, optionset);
|
|
@@ -0,0 +0,0 @@ public class DedicatedServerProperties extends PropertyManager<DedicatedServerPr
|
|
this.textFilteringConfig = this.getString("text-filtering-config", "");
|
|
this.playerIdleTimeout = this.b("player-idle-timeout", 0);
|
|
this.whiteList = this.b("white-list", false);
|
|
+ // Paper start - Configurable rcon ip
|
|
+ final String rconIp = this.getSettingIfExists("rcon.ip");
|
|
+ this.rconIp = rconIp == null ? this.serverIp : rconIp;
|
|
+ // Paper end
|
|
this.generatorSettings = GeneratorSettings.a(iregistrycustom, properties);
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/dedicated/PropertyManager.java b/src/main/java/net/minecraft/server/dedicated/PropertyManager.java
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/net/minecraft/server/dedicated/PropertyManager.java
|
|
+++ b/src/main/java/net/minecraft/server/dedicated/PropertyManager.java
|
|
@@ -0,0 +0,0 @@ public abstract class PropertyManager<T extends PropertyManager<T>> {
|
|
};
|
|
}
|
|
|
|
- @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/rcon/thread/RemoteControlListener.java b/src/main/java/net/minecraft/server/rcon/thread/RemoteControlListener.java
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/net/minecraft/server/rcon/thread/RemoteControlListener.java
|
|
+++ b/src/main/java/net/minecraft/server/rcon/thread/RemoteControlListener.java
|
|
@@ -0,0 +0,0 @@ public class RemoteControlListener extends RemoteConnectionThread {
|
|
@Nullable
|
|
public static RemoteControlListener a(IMinecraftServer iminecraftserver) {
|
|
DedicatedServerProperties dedicatedserverproperties = iminecraftserver.getDedicatedServerProperties();
|
|
- String s = iminecraftserver.h_();
|
|
+ String s = dedicatedserverproperties.rconIp; // Paper - Configurable rcon ip
|
|
|
|
if (s.isEmpty()) {
|
|
s = "0.0.0.0";
|