add sender UUID to command packet

Author: mcmonkey4eva

src/main/java/com/denizenscript/depenizen/bungee/DepenizenBungee.java

@@ -6,6 +6,7 @@
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.*;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.api.plugin.Plugin;
@@ -174,7 +175,8 @@ public void onProxyCommand(ChatEvent event) {
                 CompletableFuture<String> future = new CompletableFuture<>();
                 futures.add(future);
                 proxyCommandWaiters.put(newId, future);
-                connection.sendPacket(new ProxyCommandPacketOut(newId, ((CommandSender) event.getSender()).getName(), event.getMessage()));
+                connection.sendPacket(new ProxyCommandPacketOut(newId, ((CommandSender) event.getSender()).getName(),
+                        event.getSender() instanceof ProxiedPlayer ? ((ProxiedPlayer) event.getSender()).getUniqueId() : null, event.getMessage()));
             }
         }
         if (futures.isEmpty()) {

src/main/java/com/denizenscript/depenizen/bungee/packets/out/ProxyCommandPacketOut.java

@@ -3,12 +3,15 @@
 import com.denizenscript.depenizen.bungee.PacketOut;
 import io.netty.buffer.ByteBuf;
 
+import java.util.UUID;
+
 public class ProxyCommandPacketOut extends PacketOut {
 
-    public ProxyCommandPacketOut(long id ,String sender, String command) {
+    public ProxyCommandPacketOut(long id , String sender, UUID senderId, String command) {
         this.id = id;
         this.sender = sender;
         this.command = command;
+        this.senderId = senderId;
     }
 
     public long id;
@@ -17,6 +20,8 @@ public ProxyCommandPacketOut(long id ,String sender, String command) {
 
     public String command;
 
+    public UUID senderId;
+
     @Override
     public int getPacketId() {
         return 61;
@@ -27,5 +32,6 @@ public void writeTo(ByteBuf buf) {
         buf.writeLong(id);
         writeString(buf, sender);
         writeString(buf, command);
+        writeString(buf, senderId == null ? "" : senderId.toString());
     }
 }