SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPIGOT-7467: Add getAddress to RemoteConsoleCommandSender

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2023-08-26 18:19:22 +10:00
parent 6fdc83ddd9
commit a16df1b04c
6 changed files with 179 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
paper-server/src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java
View File

@@ -1,5 +1,6 @@
package org.bukkit.craftbukkit.command;
import java.net.SocketAddress;
import net.minecraft.network.chat.IChatBaseComponent;
import net.minecraft.server.rcon.RemoteControlCommandListener;
import org.bukkit.command.RemoteConsoleCommandSender;
@@ -12,6 +13,15 @@ public class CraftRemoteConsoleCommandSender extends ServerCommandSender impleme
this.listener = listener;
}
public RemoteControlCommandListener getListener() {
return listener;
}
@Override
public SocketAddress getAddress() {
return listener.socketAddress;
}
@Override
public void sendMessage(String message) {
listener.sendSystemMessage(IChatBaseComponent.literal(message + "\n")); // Send a newline after each message, to preserve formatting.

2
paper-server/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
View File

@@ -75,7 +75,7 @@ public final class VanillaCommandWrapper extends BukkitCommand {
return ((CraftBlockCommandSender) sender).getWrapper();
}
if (sender instanceof RemoteConsoleCommandSender) {
return ((DedicatedServer) MinecraftServer.getServer()).rconConsoleSource.createCommandSourceStack();
return ((CraftRemoteConsoleCommandSender) sender).getListener().createCommandSourceStack();
}
if (sender instanceof ConsoleCommandSender) {
return ((CraftServer) sender.getServer()).getServer().createCommandSourceStack();