6 files changed, 126 insertions, 6 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/CountdownDisplay.java b/src/main/java/net/tylermurphy/hideAndSeek/game/util/CountdownDisplay.java
index 477f7ca..e735af9 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/CountdownDisplay.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/util/CountdownDisplay.java
@@ -17,7 +17,7 @@
  *
  */
 
-package net.tylermurphy.hideAndSeek.util;
+package net.tylermurphy.hideAndSeek.game.util;
 
 public enum CountdownDisplay {
     CHAT,
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/Packet.java b/src/main/java/net/tylermurphy/hideAndSeek/game/util/Packet.java
index bb7219f..0fad539 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/Packet.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/util/Packet.java
@@ -17,7 +17,7 @@
  *
  */
 
-package net.tylermurphy.hideAndSeek.util;
+package net.tylermurphy.hideAndSeek.game.util;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/util/PlayerUtil.java b/src/main/java/net/tylermurphy/hideAndSeek/game/util/PlayerUtil.java
new file mode 100644
index 0000000..61d2b0e
--- /dev/null
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/util/PlayerUtil.java
@@ -0,0 +1,120 @@
+package net.tylermurphy.hideAndSeek.game.util;
+
+import com.cryptomorin.xseries.messages.Titles;
+import net.md_5.bungee.api.ChatColor;
+import net.tylermurphy.hideAndSeek.Main;
+import net.tylermurphy.hideAndSeek.configuration.Items;
+import net.tylermurphy.hideAndSeek.game.Board;
+import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.attribute.Attribute;
+import org.bukkit.attribute.AttributeInstance;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+
+import static net.tylermurphy.hideAndSeek.configuration.Config.*;
+import static net.tylermurphy.hideAndSeek.configuration.Config.lobbyPosition;
+import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
+
+public class PlayerUtil {
+
+    public static void loadHider(Player player, String gameWorld){
+        player.teleport(new Location(Bukkit.getWorld(gameWorld), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ()));
+        loadPlayer(player);
+        player.addPotionEffect(new PotionEffect(PotionEffectType.SPEED,1000000,5,false,false));
+        Titles.sendTitle(player, 10, 70, 20, ChatColor.WHITE + "" + message("HIDER_TEAM_NAME"), ChatColor.WHITE + message("HIDERS_SUBTITLE").toString());
+    }
+
+    public static void loadSeeker(Player player, String gameWorld){
+        player.teleport(new Location(Bukkit.getWorld(gameWorld), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ()));
+        loadPlayer(player);
+        player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS,1000000,127,false,false));
+        player.addPotionEffect(new PotionEffect(PotionEffectType.SLOW,1000000,127,false,false));
+        player.addPotionEffect(new PotionEffect(PotionEffectType.JUMP,1000000,128,false,false));
+        Titles.sendTitle(player, 10, 70, 20, ChatColor.WHITE + "" + message("SEEKER_TEAM_NAME"), ChatColor.WHITE + message("SEEKERS_SUBTITLE").toString());
+    }
+
+    public static void loadSpectator(Player player, String gameWorld){
+        player.teleport(new Location(Bukkit.getWorld(gameWorld), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ()));
+        loadPlayer(player);
+        player.setAllowFlight(true);
+        player.setFlying(true);
+        player.setFallDistance(0.0F);
+        Main.getInstance().getBoard().getPlayers().forEach(otherPlayer -> {
+            otherPlayer.hidePlayer(player);
+        });
+        Titles.sendTitle(player, 10, 70, 20, ChatColor.GRAY + "" + ChatColor.BOLD + "SPECTATING", ChatColor.WHITE + message("SPECTATOR_SUBTITLE").toString());
+    }
+
+    public static void resetPlayer(Player player, Board board){
+        loadPlayer(player);
+        if (board.isSeeker(player)) {
+            if (pvpEnabled)
+                for(ItemStack item : Items.SEEKER_ITEMS)
+                    player.getInventory().addItem(item);
+            for(PotionEffect effect : Items.SEEKER_EFFECTS)
+                player.addPotionEffect(effect);
+        } else if (board.isHider(player)) {
+            if (pvpEnabled)
+                for(ItemStack item : Items.HIDER_ITEMS)
+                    player.getInventory().addItem(item);
+            for(PotionEffect effect : Items.HIDER_EFFECTS)
+                player.addPotionEffect(effect);
+            if (glowEnabled) {
+                player.getInventory().addItem(glowPowerupItem);
+            }
+        }
+    }
+
+    public static void unloadPlayer(Player player){
+        player.setGameMode(GameMode.ADVENTURE);
+        player.getInventory().clear();
+        for(PotionEffect effect : player.getActivePotionEffects()) {
+            player.removePotionEffect(effect.getType());
+        }
+        if (Version.atLeast("1.9")) {
+            AttributeInstance attribute = player.getAttribute(Attribute.GENERIC_MAX_HEALTH);
+            if (attribute != null) player.setHealth(attribute.getValue());
+            for(Player temp : Main.getInstance().getBoard().getPlayers()) {
+                Packet.setGlow(player, temp, false);
+            }
+        } else {
+            player.setHealth(player.getMaxHealth());
+        }
+        Main.getInstance().getBoard().getPlayers().forEach(temp -> {
+            player.showPlayer(temp);
+            temp.showPlayer(player);
+        });
+        player.setAllowFlight(false);
+        player.setFlying(false);
+        player.setFallDistance(0.0F);
+    }
+
+    public static void joinPlayer(Player player){
+        player.teleport(new Location(Bukkit.getWorld(lobbyWorld), lobbyPosition.getX(),lobbyPosition.getY(),lobbyPosition.getZ()));
+        loadPlayer(player);
+        if (lobbyStartItem != null && (!lobbyItemStartAdmin || player.hasPermission("hideandseek.start")))
+            player.getInventory().setItem(lobbyItemStartPosition, lobbyStartItem);
+        if (lobbyLeaveItem != null)
+            player.getInventory().setItem(lobbyItemLeavePosition, lobbyLeaveItem);
+    }
+
+    private static void loadPlayer(Player player){
+        player.setGameMode(GameMode.ADVENTURE);
+        player.getInventory().clear();
+        for(PotionEffect effect : player.getActivePotionEffects()) {
+            player.removePotionEffect(effect.getType());
+        }
+        player.setFoodLevel(20);
+        if (Version.atLeast("1.9")) {
+            AttributeInstance attribute = player.getAttribute(Attribute.GENERIC_MAX_HEALTH);
+            if (attribute != null) player.setHealth(attribute.getValue());
+        } else {
+            player.setHealth(player.getMaxHealth());
+        }
+    }
+
+}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/Status.java b/src/main/java/net/tylermurphy/hideAndSeek/game/util/Status.java
index 0ffba00..e630070 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/Status.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/util/Status.java
@@ -17,10 +17,10 @@
  *
  */
 
-package net.tylermurphy.hideAndSeek.util;
+package net.tylermurphy.hideAndSeek.game.util;
 
 public enum Status {
 
-    STANDBY, STARTING, PLAYING, ENDING
+    STANDBY, STARTING, PLAYING, ENDING, ENDED
 
 }
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/Version.java b/src/main/java/net/tylermurphy/hideAndSeek/game/util/Version.java
index fa66fe2..e2dcfdd 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/Version.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/util/Version.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.util;
+package net.tylermurphy.hideAndSeek.game.util;
 
 import org.bukkit.Bukkit;
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/WinType.java b/src/main/java/net/tylermurphy/hideAndSeek/game/util/WinType.java
index 1f6ccd8..f584d80 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/WinType.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/util/WinType.java
@@ -17,7 +17,7 @@
  *
  */
 
-package net.tylermurphy.hideAndSeek.util;
+package net.tylermurphy.hideAndSeek.game.util;
 
 public enum WinType {