Paper-Old/Spigot-Server-Patches/0104-Configurable-RCON-IP-address.patch

From 24629d8216ef7f94026a4c062775768a7463683f 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/RemoteControlListener.java b/src/main/java/net/minecraft/server/RemoteControlListener.java
index 32244b55a2..4bfd41af18 100644
--- a/src/main/java/net/minecraft/server/RemoteControlListener.java
+++ b/src/main/java/net/minecraft/server/RemoteControlListener.java
@@ -23,7 +23,7 @@ public class RemoteControlListener extends RemoteConnectionThread {
         super(iminecraftserver, "RCON Listener");
         this.h = iminecraftserver.a("rcon.port", 0);
         this.l = iminecraftserver.a("rcon.password", "");
-        this.j = iminecraftserver.e();
+        this.j = iminecraftserver.a("rcon.ip", ((DedicatedServer) iminecraftserver).getServerIp()); // Paper
         this.i = iminecraftserver.e_();
         if (0 == this.h) {
             this.h = this.i + 10;
-- 
2.19.0
[CI-SKIP] Undo an accidental merger of patches Accidently merged 1 pathfinding patch into a light patch instead of the other pathfinding page. Fixed that. Hand editting patch master race 2018-10-05 05:31:01 +02:00			`From 24629d8216ef7f94026a4c062775768a7463683f Mon Sep 17 00:00:00 2001`
NOT FINISHED!!! Current Progress on 1.13-pre7 update This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail. 2018-07-15 03:53:17 +02:00			`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/RemoteControlListener.java b/src/main/java/net/minecraft/server/RemoteControlListener.java`
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot. 2018-09-01 00:56:57 +02:00			`index 32244b55a2..4bfd41af18 100644`
NOT FINISHED!!! Current Progress on 1.13-pre7 update This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail. 2018-07-15 03:53:17 +02:00			`--- a/src/main/java/net/minecraft/server/RemoteControlListener.java`
			`+++ b/src/main/java/net/minecraft/server/RemoteControlListener.java`
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot. 2018-09-01 00:56:57 +02:00			`@@ -23,7 +23,7 @@ public class RemoteControlListener extends RemoteConnectionThread {`
NOT FINISHED!!! Current Progress on 1.13-pre7 update This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail. 2018-07-15 03:53:17 +02:00			`super(iminecraftserver, "RCON Listener");`
			`this.h = iminecraftserver.a("rcon.port", 0);`
			`this.l = iminecraftserver.a("rcon.password", "");`
			`- this.j = iminecraftserver.e();`
Fix RCON Ip Defaulting to wrong value - Closes #1267 2018-07-25 07:24:28 +02:00			`+ this.j = iminecraftserver.a("rcon.ip", ((DedicatedServer) iminecraftserver).getServerIp()); // Paper`
Paper 1.13.1 Update Updated Upstream (Bukkit/CraftBukkit/Spigot) Bukkit Changes: 2dcc44dc SPIGOT-4307: Fix hacky API for banners on shields e0fc6572 SPIGOT-4309: Add "forced" display of particles efeeab2f Add index to README.md for easier navigation f502bc6f Update to Minecraft 1.13.1 CraftBukkit Changes: d0bb0a1d Fix some tests randomly failing 997d378d Fix client stall in specific teleportation scenarios b3dc2366 SPIGOT-4307: Fix hacky API for banners on shields 2a271162 SPIGOT-4301: Fix more invalid enchants 5d0d83bb SPIGOT-4309: Add "forced" display of particles a6772578 Add additional tests for CraftBlockData ce1af0c3 Update to Minecraft 1.13.1 Spigot Changes: 2440e189 Rebuild patches 4ecffced Update to Minecraft 1.13.1 2018-08-26 20:11:49 +02:00			`this.i = iminecraftserver.e_();`
NOT FINISHED!!! Current Progress on 1.13-pre7 update This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail. 2018-07-15 03:53:17 +02:00			`if (0 == this.h) {`
			`this.h = this.i + 10;`
			`--`
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers CraftBukkit Changes: 1cf8b5dc SPIGOT-4400: Populators running on existing chunks 116cb9a1 SPIGOT-4399: Add attribute modifier equality test 5ee1c18a SPIGOT-4398: Set ASM7_EXPERIMENTAL flag 2018-09-29 01:31:59 +02:00			`2.19.0`
NOT FINISHED!!! Current Progress on 1.13-pre7 update This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail. 2018-07-15 03:53:17 +02:00