From 69fad5221c73fbbfd2377a191f3effa2090480c1 Mon Sep 17 00:00:00 2001 From: ME1312 Date: Sat, 4 Jul 2020 23:31:58 -0400 Subject: [PATCH] Allow selecting the master proxy in placeholders --- .../Bukkit/Library/Compatibility/PlaceholderImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/PlaceholderImpl.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/PlaceholderImpl.java index f8ce2c5d..6945d90c 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/PlaceholderImpl.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/PlaceholderImpl.java @@ -137,9 +137,7 @@ public class PlaceholderImpl extends PlaceholderExpansion implements Taskable, C Server server = (plugin.api.getName() != null)? cache.getServer(plugin.api.getName()) : null; SubServer subserver = (server instanceof SubServer)? (SubServer) server : null; Host host = (subserver != null)? cache.getHost(subserver.getHost()) : null; - Proxy proxy = null; - - String debug = Arrays.asList(args).toString(); + Proxy proxy = cache.getMasterProxy(); method = method.toLowerCase(); if (method.startsWith("proxy.")) { @@ -182,6 +180,9 @@ public class PlaceholderImpl extends PlaceholderExpansion implements Taskable, C return null; } } else switch (method) { // --- Straight up Methods --- + case "example": { + return ChatColor.LIGHT_PURPLE + "Example!"; + } case "proxy": case "proxies": { return ChatColor.AQUA + Integer.toString(cache.getProxies().size() + 1);