Added starting & waiting to tier placeholder

MetallicGoat · Nov 19, 2021 · ef794c9 · ef794c9
1 parent c3e394d
commit ef794c9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/main/java/me/metallicgoat/MBedwarsTweaks/Placeholders.java b/src/main/java/me/metallicgoat/MBedwarsTweaks/Placeholders.java
@@ -43,19 +43,26 @@ public String onRequest(OfflinePlayer player, @NotNull String params) {
                     Arena arena = BedwarsAPI.getGameAPI().getArenaByPlayer(player1);
                     if (arena != null) {
 
-                        String nextTierName = GenTiers.nextTierMap.get(arena);
-                        String nextTierTime = GenTiers.timeLeft(arena);
-
                         switch (arena.getStatus()) {
                             case LOBBY:
-                                return "Game is still in Lobby";
+                                int time = (int) arena.getLobbyTimeRemaining();
+                                if(time > 0){
+                                    //Waiting
+                                    return Message.build(ServerManager.getConfig().getString("Next-Tier-Placeholder-Lobby-Starting")).placeholder("time", time).done();
+                                }else{
+                                    //Starting
+                                    return Message.build(ServerManager.getConfig().getString("Next-Tier-Placeholder-Lobby-Waiting")).done();
+                                }
                             case END_LOBBY:
                                 return "Game Ended";
                             case STOPPED:
                                 return "Game Stopped";
                             case RESETTING:
                                 return "Game Resetting";
                             case RUNNING:
+                                String nextTierName = GenTiers.nextTierMap.get(arena);
+                                String nextTierTime = GenTiers.timeLeft(arena);
+
                                 return Message.build(ServerManager.getConfig().getString("Next-Tier-Placeholder"))
                                         .placeholder("next-tier", nextTierName)
                                         .placeholder("time", nextTierTime)

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -97,6 +97,10 @@ Spawner-Title:
 # {next-tier} {time}
 Next-Tier-Placeholder: '{next-tier} in &a{time}'
 
+Next-Tier-Placeholder-Lobby-Starting: "&fStarting in &a{time}s"
+
+Next-Tier-Placeholder-Lobby-Waiting: "&fWaiting..."
+
 ############### BED BREAK ###############
 
 #Message displayed when any bed is broken (to everyone in the arena)