From ecd1ca35d037bc55d0e2f9a626d66eab96f83f99 Mon Sep 17 00:00:00 2001
From: ajgeiss0702 <ajgeiss72@gmail.com>
Date: Mon, 19 Jun 2023 07:54:33 -0700
Subject: [PATCH] Fixed player status placeholder not working

---
 .../common/communication/handlers/PlayerStatusHandler.java     | 2 +-
 .../src/main/java/us/ajg0702/queue/spigot/api/SpigotAPI.java   | 3 ++-
 .../queue/spigot/placeholders/PlaceholderExpansion.java        | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/us/ajg0702/queue/common/communication/handlers/PlayerStatusHandler.java b/common/src/main/java/us/ajg0702/queue/common/communication/handlers/PlayerStatusHandler.java
index 62e3d6ed..d4f7df01 100644
--- a/common/src/main/java/us/ajg0702/queue/common/communication/handlers/PlayerStatusHandler.java
+++ b/common/src/main/java/us/ajg0702/queue/common/communication/handlers/PlayerStatusHandler.java
@@ -17,7 +17,7 @@ public ComResponse handleMessage(AdaptedPlayer player, String data) {
         if(server == null) {
             return ComResponse
                     .from("playerstatus")
-                    .id(data)
+                    .id(player.getUniqueId() + data)
                     .with("invalid_server");
         }
         if(!player.isConnected() || player.getServerName() == null) return null;
diff --git a/spigot/src/main/java/us/ajg0702/queue/spigot/api/SpigotAPI.java b/spigot/src/main/java/us/ajg0702/queue/spigot/api/SpigotAPI.java
index adeb7ea1..f37e3667 100644
--- a/spigot/src/main/java/us/ajg0702/queue/spigot/api/SpigotAPI.java
+++ b/spigot/src/main/java/us/ajg0702/queue/spigot/api/SpigotAPI.java
@@ -142,10 +142,11 @@ public Future<String> getServerStatusString(String queueName, UUID player) {
         if(p == null) throw new IllegalArgumentException("Player must be online!");
 
         String channel = player == null ? "status" : "playerstatus";
+        String id = player == null ? queueName : player + queueName;
 
         CompletableFuture<String> future = new CompletableFuture<>();
 
-        responseManager.awaitResponse(queueName, channel, response -> {
+        responseManager.awaitResponse(id, channel, response -> {
             String responseString = response.getResponse();
             if(responseString.equals("invalid_server")) {
                 future.completeExceptionally(new IllegalArgumentException(queueName + " does not exist!"));
diff --git a/spigot/src/main/java/us/ajg0702/queue/spigot/placeholders/PlaceholderExpansion.java b/spigot/src/main/java/us/ajg0702/queue/spigot/placeholders/PlaceholderExpansion.java
index f4d1eaee..393f099f 100644
--- a/spigot/src/main/java/us/ajg0702/queue/spigot/placeholders/PlaceholderExpansion.java
+++ b/spigot/src/main/java/us/ajg0702/queue/spigot/placeholders/PlaceholderExpansion.java
@@ -29,8 +29,8 @@ public PlaceholderExpansion(SpigotMain plugin) {
         placeholders.add(new PositionOf(plugin));
         placeholders.add(new Queued(plugin));
         placeholders.add(new QueuedFor(plugin));
-        placeholders.add(new Status(plugin));
         placeholders.add(new StatusPlayer(plugin));
+        placeholders.add(new Status(plugin));
 
     }