Fix some placeholders not working for spectators, and finish R2

MetallicGoat · Dec 18, 2021 · bf2c925 · bf2c925
1 parent b370adf
commit bf2c925
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.metallicgoat</groupId>
     <artifactId>TweaksAndFeatures</artifactId>
-    <version>1.0.0-R1</version>
+    <version>1.0.0-R2</version>
 
     <repositories>
         <repository>

diff --git a/src/main/java/me/metallicgoat/MBedwarsTweaks/Placeholders.java b/src/main/java/me/metallicgoat/MBedwarsTweaks/Placeholders.java
@@ -35,14 +35,13 @@ public class Placeholders extends PlaceholderExpansion {
     @Override
     public String onRequest(OfflinePlayer player, @NotNull String params) {
 
-        Player player1 = Bukkit.getPlayer(player.getUniqueId());
+        final Player player1 = Bukkit.getPlayer(player.getUniqueId());
+        final Arena arena = BedwarsAPI.getGameAPI().getSpectatingPlayers().contains(player1) ? BedwarsAPI.getGameAPI().getArenaBySpectator(player1):BedwarsAPI.getGameAPI().getArenaByPlayer(player1);
 
         switch (params.toLowerCase()){
             case "next-tier":
                 //Gen Tiers With countdown
                 if(ServerManager.getConfig().getBoolean("Gen-Tiers-Enabled")) {
-
-                    Arena arena = BedwarsAPI.getGameAPI().getArenaByPlayer(player1);
                     if (arena != null) {
 
                         switch (arena.getStatus()) {
@@ -82,7 +81,6 @@ public String onRequest(OfflinePlayer player, @NotNull String params) {
             //Next tier name
             case "next-tier-name":
                 if(ServerManager.getConfig().getBoolean("Gen-Tiers-Enabled")) {
-                    Arena arena = BedwarsAPI.getGameAPI().getArenaByPlayer(player1);
                     if (arena != null && arena.getStatus() == ArenaStatus.RUNNING) {
                         String nextTierName = GenTiers.nextTierMap.get(arena);
                         return Message.build(nextTierName).done();
@@ -91,7 +89,6 @@ public String onRequest(OfflinePlayer player, @NotNull String params) {
                 return "---";
             //Arena mode placeholder (eg. Solo, Duos)
             case "arena-mode":
-                Arena arena = BedwarsAPI.getGameAPI().getArenaByPlayer(player1);
                 if (arena != null) {
                     int teamsAmount = arena.getEnabledTeams().size();
                     int playersPerTeam = arena.getPlayersPerTeam();
@@ -119,7 +116,6 @@ public String onRequest(OfflinePlayer player, @NotNull String params) {
         //Team status placeholder, to be used on scoreboard
         if(params.toLowerCase().startsWith("team-status-")){
             String output;
-            Arena arena = BedwarsAPI.getGameAPI().getArenaByPlayer(player1);
             String teamName = params.replace("team-status-", "");
 
             if(arena != null && (arena.getStatus() == ArenaStatus.RUNNING || arena.getStatus() == ArenaStatus.END_LOBBY)){

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,4 +1,4 @@
-version: 1.0.0-R1
+version: 1.0.0-R2
 name: MBedwarsTweaks
 author: MetallicGoat
 main: me.metallicgoat.MBedwarsTweaks.Main