SPIGOT-7467: Add getAddress to RemoteConsoleCommandSender

By: md_5 <git@md-5.net>
2023-08-26 18:19:22 +10:00
parent 6fdc83ddd9
commit a16df1b04c
6 changed files with 179 additions and 54 deletions
--- a/paper-server/nms-patches/net/minecraft/server/rcon/RemoteControlCommandListener.patch
+++ b/paper-server/nms-patches/net/minecraft/server/rcon/RemoteControlCommandListener.patch
@@ -1,6 +1,32 @@
 --- a/net/minecraft/server/rcon/RemoteControlCommandListener.java
 +++ b/net/minecraft/server/rcon/RemoteControlCommandListener.java
-@@ -34,6 +34,17 @@
+@@ -9,14 +9,23 @@
+ import net.minecraft.world.phys.Vec2F;
+ import net.minecraft.world.phys.Vec3D;
+ 
+// CraftBukkit start
+import java.net.SocketAddress;
+import org.bukkit.craftbukkit.command.CraftRemoteConsoleCommandSender;
+// CraftBukkit end
+ public class RemoteControlCommandListener implements ICommandListener {
+ 
+     private static final String RCON = "Rcon";
+     private static final IChatBaseComponent RCON_COMPONENT = IChatBaseComponent.literal("Rcon");
+     private final StringBuffer buffer = new StringBuffer();
+     private final MinecraftServer server;
+-
+-    public RemoteControlCommandListener(MinecraftServer minecraftserver) {
+    // CraftBukkit start
+    public final SocketAddress socketAddress;
+    private final CraftRemoteConsoleCommandSender remoteConsole = new CraftRemoteConsoleCommandSender(this);
+
+    public RemoteControlCommandListener(MinecraftServer minecraftserver, SocketAddress socketAddress) {
+        this.socketAddress = socketAddress;
+        // CraftBukkit end
+         this.server = minecraftserver;
+     }
+ 
+@@ -34,6 +43,17 @@
         return new CommandListenerWrapper(this, Vec3D.atLowerCornerOf(worldserver.getSharedSpawnPos()), Vec2F.ZERO, worldserver, 4, "Rcon", RemoteControlCommandListener.RCON_COMPONENT, this.server, (Entity) null);
     }
 
@@ -11,7 +37,7 @@
 +
 +    @Override
 +    public org.bukkit.command.CommandSender getBukkitSender(CommandListenerWrapper wrapper) {
-+        return server.remoteConsole;
+        return this.remoteConsole;
 +    }
 +    // CraftBukkit end
 +
--- a/paper-server/nms-patches/net/minecraft/server/rcon/thread/RemoteControlSession.patch
+++ b/paper-server/nms-patches/net/minecraft/server/rcon/thread/RemoteControlSession.patch
@@ -0,0 +1,77 @@
+--- a/net/minecraft/server/rcon/thread/RemoteControlSession.java
+++ b/net/minecraft/server/rcon/thread/RemoteControlSession.java
+@@ -11,6 +11,10 @@
+ import net.minecraft.server.IMinecraftServer;
+ import net.minecraft.server.rcon.StatusChallengeUtils;
+ import org.slf4j.Logger;
+// CraftBukkit start
+import net.minecraft.server.dedicated.DedicatedServer;
+import net.minecraft.server.rcon.RemoteControlCommandListener;
+// CraftBukkit end
+ 
+ public class RemoteControlSession extends RemoteConnectionThread {
+ 
+@@ -24,11 +28,14 @@
+     private final Socket client;
+     private final byte[] buf = new byte[1460];
+     private final String rconPassword;
+-    private final IMinecraftServer serverInterface;
+    // CraftBukkit start
+    private final DedicatedServer serverInterface;
+    private final RemoteControlCommandListener rconConsoleSource;
+    // CraftBukkit end
+ 
+     RemoteControlSession(IMinecraftServer iminecraftserver, String s, Socket socket) {
+         super("RCON Client " + socket.getInetAddress());
+-        this.serverInterface = iminecraftserver;
+        this.serverInterface = (DedicatedServer) iminecraftserver; // CraftBukkit
+         this.client = socket;
+ 
+         try {
+@@ -38,11 +45,14 @@
+         }
+ 
+         this.rconPassword = s;
+        this.rconConsoleSource = new net.minecraft.server.rcon.RemoteControlCommandListener(this.serverInterface, socket.getRemoteSocketAddress()); // CraftBukkit
+     }
+ 
+     public void run() {
+-        while (true) {
+-            try {
+        // CraftBukkit start - decompile error: switch try / while statement
+        try {
+            while (true) {
+                // CraftBukkit end
+                 if (!this.running) {
+                     return;
+                 }
+@@ -71,7 +81,7 @@
+                                 String s = StatusChallengeUtils.stringFromByteArray(this.buf, k, i);
+ 
+                                 try {
+-                                    this.sendCmdResponse(l, this.serverInterface.runCommand(s));
+                                    this.sendCmdResponse(l, this.serverInterface.runCommand(this.rconConsoleSource, s)); // CraftBukkit
+                                 } catch (Exception exception) {
+                                     this.sendCmdResponse(l, "Error executing: " + s + " (" + exception.getMessage() + ")");
+                                 }
+@@ -98,6 +108,7 @@
+                             continue;
+                     }
+                 }
+        } // CraftBukkit - decompile error: switch try / while statement
+             } catch (IOException ioexception) {
+                 return;
+             } catch (Exception exception1) {
+@@ -109,8 +120,10 @@
+                 this.running = false;
+             }
+ 
+-            return;
+-        }
+            // CraftBukkit start - decompile error: switch try / while statement
+            // return;
+        // }
+        // CraftBukkit end
+     }
+ 
+     private void send(int i, int j, String s) throws IOException {