Merge pull request '1.7.5' (#10) from dev into main

Reviewed-on: https://g.tylerm.dev/tylermurphy534/KenshinsHideAndSeek/pulls/10

1 files changed, 28 insertions, 26 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Board.java b/src/main/java/dev/tylerm/khs/game/Board.java
index 2050f33..c02174b 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/Board.java
+++ b/src/main/java/dev/tylerm/khs/game/Board.java
@@ -1,10 +1,10 @@
-package net.tylermurphy.hideAndSeek.game;
+package dev.tylerm.khs.game;
 
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.game.events.Border;
-import net.tylermurphy.hideAndSeek.game.events.Glow;
-import net.tylermurphy.hideAndSeek.game.events.Taunt;
-import net.tylermurphy.hideAndSeek.game.util.Status;
+import dev.tylerm.khs.game.events.Border;
+import dev.tylerm.khs.game.events.Glow;
+import dev.tylerm.khs.game.events.Taunt;
+import dev.tylerm.khs.game.util.Status;
+import dev.tylerm.khs.Main;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -13,9 +13,9 @@ import org.bukkit.scoreboard.*;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.*;
-import static net.tylermurphy.hideAndSeek.configuration.Leaderboard.*;
-import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
+import static dev.tylerm.khs.configuration.Config.*;
+import static dev.tylerm.khs.configuration.Leaderboard.*;
+import static dev.tylerm.khs.configuration.Localization.message;
 
 public class Board {
 
@@ -25,7 +25,7 @@ public class Board {
         SPECTATOR,
     }
 
-    private UUID initialSeeker = null;
+    private List<UUID> initialSeekers = null;
     private final Map<UUID, Type> Players = new HashMap<>();
     private final Map<UUID, CustomBoard> customBoards = new HashMap<>();
     private final Map<UUID, Integer> hider_kills = new HashMap<>(), seeker_kills = new HashMap<>(), hider_deaths = new HashMap<>(), seeker_deaths = new HashMap<>();
@@ -34,6 +34,10 @@ public class Board {
         return Players.containsKey(player.getUniqueId());
     }
 
+    public boolean containsUUID(UUID uuid) {
+        return Players.containsKey(uuid);
+    } 
+
     public boolean isHider(Player player) {
         return isHider(player.getUniqueId());
     }
@@ -104,9 +108,15 @@ public class Board {
                 .collect(Collectors.toList());
     }
 
-    public Player getFirstSeeker() {
-        if(initialSeeker == null) return null;
-        return Bukkit.getPlayer(initialSeeker);
+    public void setInitialSeekers(List<UUID> seekers) {
+        initialSeekers = seekers;
+    }
+
+    public List<Player> getInitialSeekers() {
+        if(initialSeekers == null) return null;
+        return initialSeekers.stream().map(u -> {
+            return Bukkit.getPlayer(u);
+        }).collect(Collectors.toList());
     }
 
     public Player getPlayer(UUID uuid) {
@@ -121,9 +131,6 @@ public class Board {
     }
 
     public void addSeeker(Player player) {
-        if(initialSeeker == null) {
-            initialSeeker = player.getUniqueId();
-        }
         Players.put(player.getUniqueId(), Type.SEEKER);
     }
 
@@ -223,7 +230,7 @@ public class Board {
     }
 
     public String getMapName() {
-        net.tylermurphy.hideAndSeek.configuration.Map map = Main.getInstance().getGame().getCurrentMap();
+        dev.tylerm.khs.configuration.Map map = Main.getInstance().getGame().getCurrentMap();
         if(map == null) return "Invalid";
         else return map.getName();
     }
@@ -347,7 +354,7 @@ public class Board {
 
     public void cleanup() {
         Players.clear();;
-        initialSeeker = null;
+        initialSeekers = null;
         customBoards.clear();
     }
 
@@ -415,13 +422,8 @@ class CustomBoard {
                 seekerTeam.setNameTagVisibility(NameTagVisibility.NEVER);
             }
         }
-        if (Main.getInstance().supports(12)) {
-            hiderTeam.setColor(ChatColor.GOLD);
-            seekerTeam.setColor(ChatColor.RED);
-        } else {
-            hiderTeam.setPrefix(ChatColor.translateAlternateColorCodes('&', "&6"));
-            seekerTeam.setPrefix(ChatColor.translateAlternateColorCodes('&', "&c"));
-        }
+        hiderTeam.setPrefix(message("HIDER_TEAM_NAME").toString() + " " + ChatColor.RESET);
+        seekerTeam.setPrefix(message("SEEKER_TEAM_NAME").toString() + " " + ChatColor.RESET);
     }
 
     public void setLine(String key, String message) {
@@ -487,4 +489,4 @@ class Line {
         this.message = message;
     }
 
-}
\ No newline at end of file
+}