From 9ec0d4fa97a97f869078a141b3aa7665975f2185 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Tue, 16 Jun 2020 16:19:23 -0700 Subject: [PATCH] Add {SERVER} placeholder to some more messages --- src/main/java/us/ajg0702/queue/Manager.java | 4 ++++ src/main/java/us/ajg0702/queue/utils/BungeeMessages.java | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/us/ajg0702/queue/Manager.java b/src/main/java/us/ajg0702/queue/Manager.java index 68e2ad8..cd371af 100644 --- a/src/main/java/us/ajg0702/queue/Manager.java +++ b/src/main/java/us/ajg0702/queue/Manager.java @@ -146,6 +146,7 @@ public class Manager { BungeeUtils.sendCustomData(ply, "actionbar", msgs.get("spigot.actionbar.offline") .replaceAll("\\{POS\\}", pos+"") .replaceAll("\\{LEN\\}", len+"") + .replaceAll("\\{SERVER\\}", s.getName()) .replaceAll("\\{STATUS\\}", or)+";time="+pl.timeBetweenPlayers); } else { int time = pos*pl.timeBetweenPlayers; @@ -164,6 +165,7 @@ public class Manager { BungeeUtils.sendCustomData(ply, "actionbar", msgs.get("spigot.actionbar.online") .replaceAll("\\{POS\\}", pos+"") .replaceAll("\\{LEN\\}", len+"") + .replaceAll("\\{SERVER\\}", s.getName()) .replaceAll("\\{TIME\\}", timeStr)+";time="+pl.timeBetweenPlayers); } } @@ -198,6 +200,7 @@ public class Manager { .replaceAll("\\{STATUS\\}", or) .replaceAll("\\{POS\\}", pos+"") .replaceAll("\\{LEN\\}", len+"") + .replaceAll("\\{SERVER\\}", s.getName()) )); } else { int time = pos*pl.timeBetweenPlayers; @@ -218,6 +221,7 @@ public class Manager { .replaceAll("\\{POS\\}", pos+"") .replaceAll("\\{LEN\\}", len+"") .replaceAll("\\{TIME\\}", timeStr) + .replaceAll("\\{SERVER\\}", s.getName()) )); } diff --git a/src/main/java/us/ajg0702/queue/utils/BungeeMessages.java b/src/main/java/us/ajg0702/queue/utils/BungeeMessages.java index 4f50ebb..dbd1731 100644 --- a/src/main/java/us/ajg0702/queue/utils/BungeeMessages.java +++ b/src/main/java/us/ajg0702/queue/utils/BungeeMessages.java @@ -59,7 +59,7 @@ public class BungeeMessages { d.put("status.offline.full", "full"); d.put("status.online.base", "&7You are in position &f{POS}&7 of &f{LEN}&7. Estimated time: {TIME}"); d.put("status.left-last-queue", "&aYou left the last queue you were in."); - d.put("status.now-in-queue", "&aYou are now queued! &7You are in position &f{POS}&7 of &f{LEN}&7.\n&7Type &f/leavequeue&7 to leave the queue!"); + d.put("status.now-in-queue", "&aYou are now queued for {SERVER}! &7You are in position &f{POS}&7 of &f{LEN}&7.\n&7Type &f/leavequeue&7 to leave the queue!"); d.put("status.now-in-empty-queue", ""); d.put("errors.server-not-exist", "&cThat server does not exist!"); @@ -80,8 +80,8 @@ public class BungeeMessages { d.put("list.total", "&7Total players in queues: &f{TOTAL}"); d.put("list.none", "&7None"); - d.put("spigot.actionbar.online", "&7You are in position &f{POS}&7 of &f{LEN}&7. Estimated time: {TIME}"); - d.put("spigot.actionbar.offline", "&7You are in position &f{POS}&7 of &f{LEN}&7."); + d.put("spigot.actionbar.online", "&7You are queued for &f{SERVER}&7. You are in position &f{POS}&7 of &f{LEN}&7. Estimated time: {TIME}"); + d.put("spigot.actionbar.offline", "&7You are queued for &f{SERVER}&7. &7You are in position &f{POS}&7 of &f{LEN}&7."); d.put("send", "&aAdded &f{PLAYER}&a to the queue for &f{SERVER}");