#759: Allow sending messages from specific UUIDs

By: Mariell Hoversholm <proximyst@proximyst.com>

paper-server/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java

@@ -1,5 +1,6 @@
 package org.bukkit.craftbukkit.command;
 
+import java.util.UUID;
 import org.bukkit.ChatColor;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.conversations.Conversation;
@@ -28,6 +29,11 @@ public class CraftConsoleCommandSender extends ServerCommandSender implements Co
         System.out.println(ChatColor.stripColor(message));
     }
 
+    @Override
+    public void sendRawMessage(UUID sender, String message) {
+      this.sendRawMessage(message); // Console doesn't know of senders
+    }
+
     @Override
     public void sendMessage(String[] messages) {
         for (String message : messages) {

paper-server/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java

@@ -2,6 +2,7 @@
 package org.bukkit.craftbukkit.command;
 
 import java.util.Set;
+import java.util.UUID;
 import net.minecraft.server.CommandListenerWrapper;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
@@ -47,6 +48,16 @@ public class ProxiedNativeCommandSender implements ProxiedCommandSender {
         getCaller().sendMessage(messages);
     }
 
+    @Override
+    public void sendMessage(UUID sender, String message) {
+        getCaller().sendMessage(sender, message);
+    }
+
+    @Override
+    public void sendMessage(UUID sender, String[] messages) {
+        getCaller().sendMessage(sender, messages);
+    }
+
     @Override
     public Server getServer() {
         return getCallee().getServer();

paper-server/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java

@@ -1,6 +1,7 @@
 package org.bukkit.craftbukkit.command;
 
 import java.util.Set;
+import java.util.UUID;
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
@@ -79,4 +80,14 @@ public abstract class ServerCommandSender implements CommandSender {
     public Server getServer() {
         return Bukkit.getServer();
     }
+
+    @Override
+    public void sendMessage(UUID uuid, String message) {
+        this.sendMessage(message); // ServerCommandSenders have no use for senders
+    }
+
+    @Override
+    public void sendMessage(UUID uuid, String[] messages) {
+        this.sendMessage(messages); // ServerCommandSenders have no use for senders
+    }
 }

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java

@@ -793,6 +793,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
 
     }
 
+    @Override
+    public void sendMessage(UUID sender, String message) {
+        this.sendMessage(message); // Most entities don't know about senders
+    }
+
+    @Override
+    public void sendMessage(UUID sender, String[] messages) {
+        this.sendMessage(messages); // Most entities don't know about senders
+    }
+
     @Override
     public String getName() {
         return CraftChatMessage.fromComponent(getHandle().getDisplayName());

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java

@@ -199,6 +199,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         }
     }
 
+    @Override
+    public void sendRawMessage(UUID sender, String message) {
+        if (getHandle().playerConnection == null) return;
+
+        for (IChatBaseComponent component : CraftChatMessage.fromString(message)) {
+            getHandle().playerConnection.sendPacket(new PacketPlayOutChat(component, ChatMessageType.CHAT, (sender == null) ? SystemUtils.b : sender));
+        }
+    }
+
     @Override
     public void sendMessage(String message) {
         if (!conversationTracker.isConversingModaly()) {
@@ -213,6 +222,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         }
     }
 
+    @Override
+    public void sendMessage(UUID sender, String message) {
+        if (!conversationTracker.isConversingModaly()) {
+            this.sendRawMessage(sender, message);
+        }
+    }
+
+    @Override
+    public void sendMessage(UUID sender, String[] messages) {
+        for (String message : messages) {
+            sendMessage(sender, message);
+        }
+    }
+
     @Override
     public String getDisplayName() {
         return getHandle().displayName;