1 files changed, 47 insertions, 12 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/PlayerLoader.java b/src/main/java/dev/tylerm/khs/game/PlayerLoader.java
index 4ee1f5c..2387388 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/PlayerLoader.java
+++ b/src/main/java/dev/tylerm/khs/game/PlayerLoader.java
@@ -17,13 +17,13 @@
  *
  */
 
-package net.tylermurphy.hideAndSeek.game;
+package dev.tylerm.khs.game;
 
 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.configuration.Map;
+import dev.tylerm.khs.Main;
+import dev.tylerm.khs.configuration.Items;
+import dev.tylerm.khs.configuration.Map;
 import org.bukkit.GameMode;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeInstance;
@@ -33,8 +33,10 @@ 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.Localization.message;
+import static dev.tylerm.khs.configuration.Config.*;
+import static dev.tylerm.khs.configuration.Items.HIDER_ITEMS;
+import static dev.tylerm.khs.configuration.Items.SEEKER_ITEMS;
+import static dev.tylerm.khs.configuration.Localization.message;
 
 @SuppressWarnings("deprecation")
 public class PlayerLoader {
@@ -67,19 +69,52 @@ public class PlayerLoader {
         Titles.sendTitle(player, 10, 70, 20, ChatColor.GRAY + "" + ChatColor.BOLD + "SPECTATING", ChatColor.WHITE + message("SPECTATOR_SUBTITLE").toString());
     }
 
+    public static void loadDeadHiderSpectator(Player player, Map map) {
+        map.getGameSpawn().teleport(player);
+        loadPlayer(player);
+        player.setAllowFlight(true);
+        player.setFlying(true);
+        player.setFallDistance(0.0F);
+        player.getInventory().setItem(flightToggleItemPosition, flightToggleItem);
+        player.getInventory().setItem(teleportItemPosition, teleportItem);
+        Main.getInstance().getBoard().getPlayers().forEach(otherPlayer -> otherPlayer.hidePlayer(player));
+    }
+
     public static void resetPlayer(Player player, Board board){
         if(board.isSpectator(player)) return;
         loadPlayer(player);
         if (board.isSeeker(player)) {
-            if (pvpEnabled)
-                for(ItemStack item : Items.SEEKER_ITEMS)
-                    player.getInventory().addItem(item);
+            if (pvpEnabled) {
+                for(int i = 0; i < 9; i++) {
+                    if (SEEKER_ITEMS.get(i) == null) continue;
+                    player.getInventory().setItem(i, SEEKER_ITEMS.get(i));
+                }
+                if (Items.SEEKER_HELM != null)
+                    player.getInventory().setHelmet(Items.SEEKER_HELM);
+                if (Items.SEEKER_CHEST != null)
+                    player.getInventory().setChestplate(Items.SEEKER_CHEST);
+                if (Items.SEEKER_LEGS != null)
+                    player.getInventory().setLeggings(Items.SEEKER_LEGS);
+                if (Items.SEEKER_BOOTS != null)
+                    player.getInventory().setBoots(Items.SEEKER_BOOTS);
+            }
             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);
+            if (pvpEnabled) {
+                for(int i = 0; i < 9; i++) {
+                    if (HIDER_ITEMS.get(i) == null) continue;
+                    player.getInventory().setItem(i, HIDER_ITEMS.get(i));
+                }
+                if (Items.HIDER_HELM != null)
+                    player.getInventory().setHelmet(Items.HIDER_HELM);
+                if (Items.HIDER_CHEST != null)
+                    player.getInventory().setChestplate(Items.HIDER_CHEST);
+                if (Items.HIDER_LEGS != null)
+                    player.getInventory().setLeggings(Items.HIDER_LEGS);
+                if (Items.HIDER_BOOTS != null)
+                    player.getInventory().setBoots(Items.HIDER_BOOTS);
+            }
             for(PotionEffect effect : Items.HIDER_EFFECTS)
                 player.addPotionEffect(effect);
             if (glowEnabled) {