8 files changed, 110 insertions, 62 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java b/src/main/java/dev/tylerm/khs/configuration/Config.java
index 8a71903..36d74d8 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java
+++ b/src/main/java/dev/tylerm/khs/configuration/Config.java
@@ -1,11 +1,11 @@
-package net.tylermurphy.hideAndSeek.configuration;
+package dev.tylerm.khs.configuration;
 
 import com.cryptomorin.xseries.XItemStack;
 import com.cryptomorin.xseries.XMaterial;
 import com.cryptomorin.xseries.XSound;
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.game.util.CountdownDisplay;
-import net.tylermurphy.hideAndSeek.util.Location;
+import dev.tylerm.khs.Main;
+import dev.tylerm.khs.game.util.CountdownDisplay;
+import dev.tylerm.khs.util.Location;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
@@ -88,6 +88,7 @@ public class Config {
 		teleportItemPosition,
         startingSeekerCount,
 		delayedRespawnDelay,
+		hidingTimer,
         endGameDelay;
 
 	public static float
@@ -200,6 +201,7 @@ public class Config {
         dontRewardQuit = config.getBoolean("dontRewardQuit");
         endGameDelay = Math.max(0,config.getInt("endGameDelay"));
         gameOverTitle = config.getBoolean("gameOverTitle");
+		hidingTimer = Math.max(10, config.getInt("hidingTimer"));
 
 		try {
 			countdownDisplay = CountdownDisplay.valueOf(config.getString("hideCountdownDisplay"));
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java b/src/main/java/dev/tylerm/khs/configuration/ConfigManager.java
index 92fa4ce..3a81cb8 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/ConfigManager.java
+++ b/src/main/java/dev/tylerm/khs/configuration/ConfigManager.java
@@ -1,6 +1,6 @@
-package net.tylermurphy.hideAndSeek.configuration;
+package dev.tylerm.khs.configuration;
 
-import net.tylermurphy.hideAndSeek.Main;
+import dev.tylerm.khs.Main;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Items.java b/src/main/java/dev/tylerm/khs/configuration/Items.java
index 8b4cddc..af8216d 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Items.java
+++ b/src/main/java/dev/tylerm/khs/configuration/Items.java
@@ -1,7 +1,7 @@
-package net.tylermurphy.hideAndSeek.configuration;
+package dev.tylerm.khs.configuration;
 
 import com.cryptomorin.xseries.XItemStack;
-import net.tylermurphy.hideAndSeek.Main;
+import dev.tylerm.khs.Main;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
@@ -33,28 +33,49 @@ public class Items {
         SEEKER_CHEST = null;
         SEEKER_LEGS = null;
         SEEKER_BOOTS = null;
+
         ConfigurationSection SeekerItems = manager.getConfigurationSection("items.seeker");
-        int i = 1;
-        while (true) {
+
+        for (int i = 0; i < 9; i++) {
             ConfigurationSection section = SeekerItems.getConfigurationSection(String.valueOf(i));
-            if (section == null) break;
+            if (section == null) {
+                SEEKER_ITEMS.add(null);
+                continue;
+            }
             ItemStack item = createItem(section);
-            if (item == null) continue;
-            String loc = section.getString("location");
-            if (loc == null) {
-                SEEKER_ITEMS.add(item);
-            } else if (loc.equals("helmet")) {
+            SEEKER_ITEMS.add(item);
+        }
+
+        ConfigurationSection SeekerHelmet = SeekerItems.getConfigurationSection("helmet");
+        if (SeekerHelmet != null) {
+            ItemStack item = createItem(SeekerHelmet);
+            if (item != null) {
                 SEEKER_HELM = item;
-            } else if (loc.equals("chestplate")) {
+            }
+        }
+
+        ConfigurationSection SeekerChestplate = SeekerItems.getConfigurationSection("chestplate");
+        if (SeekerChestplate != null) {
+            ItemStack item = createItem(SeekerChestplate);
+            if (item != null) {
                 SEEKER_CHEST = item;
-            } else if (loc.equals("leggings")) {
+            }
+        }
+
+        ConfigurationSection SeekerLeggings = SeekerItems.getConfigurationSection("leggings");
+        if (SeekerLeggings != null) {
+            ItemStack item = createItem(SeekerLeggings);
+            if (item != null) {
                 SEEKER_LEGS = item;
-            } else if (loc.equals("boots")) {
+            }
+        }
+
+        ConfigurationSection SeekerBoots = SeekerItems.getConfigurationSection("boots");
+        if (SeekerBoots != null) {
+            ItemStack item = createItem(SeekerBoots);
+            if (item != null) {
                 SEEKER_BOOTS = item;
-            } else {
-                SEEKER_ITEMS.add(item);
             }
-            i++;
         }
 
         HIDER_ITEMS = new ArrayList<>();
@@ -62,32 +83,55 @@ public class Items {
         HIDER_CHEST = null;
         HIDER_LEGS = null;
         HIDER_BOOTS = null;
+
         ConfigurationSection HiderItems = manager.getConfigurationSection("items.hider");
-        i = 1;
-        while (true) {
+
+        for (int i = 0; i < 9; i++) {
             ConfigurationSection section = HiderItems.getConfigurationSection(String.valueOf(i));
-            if (section == null) break;
+            if (section == null) {
+                HIDER_ITEMS.add(null);
+                continue;
+            }
             ItemStack item = createItem(section);
-            if (item == null) continue;
-            String loc = section.getString("location");
-            if (loc == null) {
-                HIDER_ITEMS.add(item);
-            } else if (loc.equals("helmet")) {
+            HIDER_ITEMS.add(item);
+        }
+
+        ConfigurationSection HiderHelmet = HiderItems.getConfigurationSection("helmet");
+        if (HiderHelmet != null) {
+            ItemStack item = createItem(HiderHelmet);
+            if (item != null) {
                 HIDER_HELM = item;
-            } else if (loc.equals("chestplate")) {
+            }
+        }
+
+        ConfigurationSection HiderChestplate = HiderItems.getConfigurationSection("chestplate");
+        if (HiderChestplate != null) {
+            ItemStack item = createItem(HiderChestplate);
+            if (item != null) {
                 HIDER_CHEST = item;
-            } else if (loc.equals("leggings")) {
+            }
+        }
+
+        ConfigurationSection HiderLeggings = HiderItems.getConfigurationSection("leggings");
+        if (HiderLeggings != null) {
+            ItemStack item = createItem(HiderLeggings);
+            if (item != null) {
                 HIDER_LEGS = item;
-            } else if (loc.equals("boots")) {
+            }
+        }
+
+        ConfigurationSection HiderBoots = HiderItems.getConfigurationSection("boots");
+        if (HiderBoots != null) {
+            ItemStack item = createItem(HiderBoots);
+            if (item != null) {
                 HIDER_BOOTS = item;
-            } else {
-                HIDER_ITEMS.add(item);
             }
-            i++;
         }
+
         SEEKER_EFFECTS = new ArrayList<>();
         ConfigurationSection SeekerEffects = manager.getConfigurationSection("effects.seeker");
-        i = 1;
+
+        int i = 1;
         while (true) {
             ConfigurationSection section = SeekerEffects.getConfigurationSection(String.valueOf(i));
             if (section == null) break;
@@ -135,7 +179,9 @@ public class Items {
         if (material.equalsIgnoreCase("POTION") || material.equalsIgnoreCase("SPLASH_POTION") || material.equalsIgnoreCase("LINGERING_POTION"))
             config.set("base-effect", String.format("%s,%s,%s", item.getString("type"), false, splash));
         ItemStack stack = XItemStack.deserialize(config);
-        stack.setAmount(item.getInt("amount"));
+        int amt = item.getInt("amount");
+        if (amt < 1) amt = 1;
+        stack.setAmount(amt);
         if (stack.getData().getItemType() == Material.AIR) return null;
         return stack;
     }
@@ -162,7 +208,7 @@ public class Items {
     }
 
     private static boolean equals(ItemStack a, ItemStack b) {
-        if (a == null) {
+        if (a == null || b == null) {
             return false;
         } else if (a == b) {
             return true;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Leaderboard.java b/src/main/java/dev/tylerm/khs/configuration/Leaderboard.java
index 63dc850..93ba855 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Leaderboard.java
+++ b/src/main/java/dev/tylerm/khs/configuration/Leaderboard.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.configuration;
+package dev.tylerm.khs.configuration;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java b/src/main/java/dev/tylerm/khs/configuration/Localization.java
index babf759..2ac84e7 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java
+++ b/src/main/java/dev/tylerm/khs/configuration/Localization.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.configuration;
+package dev.tylerm.khs.configuration;
 
 import net.md_5.bungee.api.ChatColor;
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/LocalizationString.java b/src/main/java/dev/tylerm/khs/configuration/LocalizationString.java
index b457622..5dc3724 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/LocalizationString.java
+++ b/src/main/java/dev/tylerm/khs/configuration/LocalizationString.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.configuration;
+package dev.tylerm.khs.configuration;
 
 import org.bukkit.entity.Entity;
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Map.java b/src/main/java/dev/tylerm/khs/configuration/Map.java
index 394bbf3..7d3ef9f 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Map.java
+++ b/src/main/java/dev/tylerm/khs/configuration/Map.java
@@ -1,26 +1,26 @@
-package net.tylermurphy.hideAndSeek.configuration;
+package dev.tylerm.khs.configuration;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.game.events.Border;
-import net.tylermurphy.hideAndSeek.world.WorldLoader;
-import net.tylermurphy.hideAndSeek.util.Location;
+import dev.tylerm.khs.Main;
+import dev.tylerm.khs.game.events.Border;
+import dev.tylerm.khs.util.Location;
+import dev.tylerm.khs.world.WorldLoader;
 import org.bukkit.*;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.*;
+import static dev.tylerm.khs.configuration.Config.*;
 
 public class Map {
 
     private final String name;
 
-    private Location
-        spawnPosition = Location.getDefault(),
-        lobbyPosition = Location.getDefault(),
-        seekerLobbyPosition = Location.getDefault();
+    private dev.tylerm.khs.util.Location
+        spawnPosition = dev.tylerm.khs.util.Location.getDefault(),
+        lobbyPosition = dev.tylerm.khs.util.Location.getDefault(),
+        seekerLobbyPosition = dev.tylerm.khs.util.Location.getDefault();
 
     private int
         xBoundMin = 0,
@@ -51,15 +51,15 @@ public class Map {
         this.worldLoader = new WorldLoader(this);
     }
 
-    public void setSpawn(Location pos) {
+    public void setSpawn(dev.tylerm.khs.util.Location pos) {
         this.spawnPosition = pos;
     }
 
-    public void setLobby(Location pos) {
+    public void setLobby(dev.tylerm.khs.util.Location pos) {
         this.lobbyPosition = pos;
     }
 
-    public void setSeekerLobby(Location pos) {
+    public void setSeekerLobby(dev.tylerm.khs.util.Location pos) {
         this.seekerLobbyPosition = pos;
     }
 
@@ -100,7 +100,7 @@ public class Map {
     }
 
     @NotNull
-    public Location getGameSpawn() {
+    public dev.tylerm.khs.util.Location getGameSpawn() {
         if(mapSaveEnabled) {
             return spawnPosition.changeWorld("hs_"+name);
         } else {
@@ -117,7 +117,7 @@ public class Map {
     }
 
     @NotNull
-    public Location getSpawn() {
+    public dev.tylerm.khs.util.Location getSpawn() {
         return spawnPosition;
     }
 
@@ -127,7 +127,7 @@ public class Map {
     }
 
     @NotNull
-    public Location getLobby() {
+    public dev.tylerm.khs.util.Location getLobby() {
         return lobbyPosition;
     }
 
@@ -137,7 +137,7 @@ public class Map {
     }
 
     @NotNull
-    public Location getSeekerLobby() {
+    public dev.tylerm.khs.util.Location getSeekerLobby() {
         return seekerLobbyPosition;
     }
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Maps.java b/src/main/java/dev/tylerm/khs/configuration/Maps.java
index d691fa9..54c6d5b 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Maps.java
+++ b/src/main/java/dev/tylerm/khs/configuration/Maps.java
@@ -1,10 +1,10 @@
-package net.tylermurphy.hideAndSeek.configuration;
+package dev.tylerm.khs.configuration;
 
 import java.util.*;
 import java.util.stream.Collectors;
 
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.util.Location;
+import dev.tylerm.khs.Main;
+import dev.tylerm.khs.util.Location;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;