From 43a6489502d52478721694717fcb98256de1ffe2 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Wed, 15 Jul 2020 18:20:36 -0700 Subject: [PATCH] added queuedfor placeholder --- src/main/java/us/ajg0702/queue/Main.java | 3 +++ src/main/java/us/ajg0702/queue/spigot/Main.java | 14 ++++++++++++++ .../java/us/ajg0702/queue/spigot/Placeholders.java | 7 +++++++ 3 files changed, 24 insertions(+) diff --git a/src/main/java/us/ajg0702/queue/Main.java b/src/main/java/us/ajg0702/queue/Main.java index b678b4a..acc40c5 100644 --- a/src/main/java/us/ajg0702/queue/Main.java +++ b/src/main/java/us/ajg0702/queue/Main.java @@ -259,6 +259,9 @@ public class Main extends Plugin implements Listener { Server server = man.getSingleServer(player); BungeeUtils.sendCustomData(player, "inqueue", (server != null)+""); } + if(subchannel.equals("queuedfor")) { + BungeeUtils.sendCustomData(player, "queuedfor", player.getName(), in.readUTF()); + } } 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 923bed2..961d109 100644 --- a/src/main/java/us/ajg0702/queue/spigot/Main.java +++ b/src/main/java/us/ajg0702/queue/spigot/Main.java @@ -114,6 +114,20 @@ public class Main extends JavaPlugin implements PluginMessageListener,Listener { phs.put("inqueue", data); placeholders.responseCache.put(p, phs); } + if(subchannel.equals("queuedfor")) { + String playername = in.readUTF(); + String queuename = in.readUTF(); + + Player p = Bukkit.getPlayer(playername); + if(p == null) return; + if(!p.isOnline()) return; + + int number = in.readInt(); + HashMap phs = placeholders.responseCache.get(p); + if(phs == null) phs = new HashMap<>(); + phs.put("queuedfor_"+queuename, number+""); + 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 526b0e8..3b10da3 100644 --- a/src/main/java/us/ajg0702/queue/spigot/Placeholders.java +++ b/src/main/java/us/ajg0702/queue/spigot/Placeholders.java @@ -174,6 +174,9 @@ public class Placeholders extends PlaceholderExpansion { if(identifier.equalsIgnoreCase("inqueue")) { return "false"; } + if(identifier.matches("queuedfor_*.*")) { + return "0"; + } } @@ -197,6 +200,10 @@ public class Placeholders extends PlaceholderExpansion { plugin.sendMessage(player, "inqueue", ""); return null; } + if(identifier.matches("queuedfor_*.*")) { + plugin.sendMessage(player, "queuedfor", identifier.split("_")[1]); + return null; + } return null;