From 29be9ae60bb65866b54c0fb0f9fdc0df7283598c Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Thu, 18 Jun 2020 09:21:16 -0700 Subject: [PATCH] added inqueue placeholder --- src/main/java/us/ajg0702/queue/Main.java | 7 ++++--- src/main/java/us/ajg0702/queue/spigot/Main.java | 12 ++++++++++++ .../java/us/ajg0702/queue/spigot/Placeholders.java | 7 +++++++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/main/java/us/ajg0702/queue/Main.java b/src/main/java/us/ajg0702/queue/Main.java index 989e47a..8e04ee7 100644 --- a/src/main/java/us/ajg0702/queue/Main.java +++ b/src/main/java/us/ajg0702/queue/Main.java @@ -198,9 +198,10 @@ public class Main extends Plugin implements Listener { } BungeeUtils.sendCustomData(player, "positionof", pos); } - /*if(subchannel.equals("whitelist")) { - String data = in.readUTF(); - }*/ + if(subchannel.equals("inqueue")) { + Server server = man.findPlayerInQueue(player); + BungeeUtils.sendCustomData(player, "inqueue", (server != null)+""); + } } catch (IOException e1) { getLogger().warning("An error occured while reading data from spigot side:"); diff --git a/src/main/java/us/ajg0702/queue/spigot/Main.java b/src/main/java/us/ajg0702/queue/spigot/Main.java index 772da94..8ec6ae2 100644 --- a/src/main/java/us/ajg0702/queue/spigot/Main.java +++ b/src/main/java/us/ajg0702/queue/spigot/Main.java @@ -99,6 +99,18 @@ public class Main extends JavaPlugin implements PluginMessageListener,Listener { phs.put("of", data); placeholders.responseCache.put(p, phs); } + if(subchannel.equals("inqueue") && papi) { + String playername = in.readUTF(); + Player p = Bukkit.getPlayer(playername); + if(p == null) return; + if(!p.isOnline()) return; + + String data = in.readUTF(); + HashMap phs = placeholders.responseCache.get(p); + if(phs == null) phs = new HashMap<>(); + phs.put("inqueue", data); + placeholders.responseCache.put(p, phs); + } } diff --git a/src/main/java/us/ajg0702/queue/spigot/Placeholders.java b/src/main/java/us/ajg0702/queue/spigot/Placeholders.java index 49f2c25..526b0e8 100644 --- a/src/main/java/us/ajg0702/queue/spigot/Placeholders.java +++ b/src/main/java/us/ajg0702/queue/spigot/Placeholders.java @@ -171,6 +171,9 @@ public class Placeholders extends PlaceholderExpansion { if(identifier.equalsIgnoreCase("position") || identifier.equalsIgnoreCase("of")) { return "None"; } + if(identifier.equalsIgnoreCase("inqueue")) { + return "false"; + } } @@ -190,6 +193,10 @@ public class Placeholders extends PlaceholderExpansion { plugin.sendMessage(player, "positionof", ""); return null; } + if(identifier.equalsIgnoreCase("inqueue")) { + plugin.sendMessage(player, "inqueue", ""); + return null; + } return null;