spawn patch, bounds checks, drop items, regen

9 files changed, 226 insertions, 187 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java
index 5881d19..9fc7009 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Config.java
@@ -61,7 +61,10 @@ public class Config {
 		mapSaveEnabled,
 		allowNaturalCauses,
 		saveInventory,
-		delayedRespawn;
+		delayedRespawn,
+		spawnPatch,
+		dropItems,
+		regenHealth;
 	
 	public static int 
 		minPlayers,
@@ -115,7 +118,7 @@ public class Config {
 		announceMessagesToNonPlayers = config.getBoolean("announceMessagesToNonPlayers");
 
 		//Prefix
-		char SYMBOL = '\u00A7';
+		char SYMBOL = '§';
 		String SYMBOL_STRING = String.valueOf(SYMBOL);
 
 		messagePrefix = config.getString("prefix.default").replace("&", SYMBOL_STRING);
@@ -237,6 +240,10 @@ public class Config {
 		delayedRespawn = config.getBoolean("delayedRespawn.enabled");
 		delayedRespawnDelay = Math.max(0,config.getInt("delayedRespawn.delay"));
 
+		spawnPatch = config.getBoolean("spawnPatch");
+		dropItems = config.getBoolean("dropItems");
+		regenHealth = config.getBoolean("regenHealth");
+
 	}
 	
 	public static void addToConfig(String path, Object value) {
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Map.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Map.java
index a23a1f7..394bbf3 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Map.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Map.java
@@ -15,224 +15,227 @@ import static net.tylermurphy.hideAndSeek.configuration.Config.*;
 
 public class Map {
 
-  private final String name;
+    private final String name;
 
-  private Location 
-    spawnPosition = Location.getDefault(),
-    lobbyPosition = Location.getDefault(),
-    seekerLobbyPosition = Location.getDefault();
+    private Location
+        spawnPosition = Location.getDefault(),
+        lobbyPosition = Location.getDefault(),
+        seekerLobbyPosition = Location.getDefault();
 
-  private int 
-    xBoundMin = 0,
-    zBoundMin = 0,
-    xBoundMax = 0,
-    zBoundMax = 0,
-    xWorldBorder = 0,
-    zWorldBorder = 0,
-    worldBorderSize = 0,
-    worldBorderDelay = 0,
-    worldBorderChange = 0;
+    private int
+        xBoundMin = 0,
+        zBoundMin = 0,
+        xBoundMax = 0,
+        zBoundMax = 0,
+        xWorldBorder = 0,
+        zWorldBorder = 0,
+        worldBorderSize = 0,
+        worldBorderDelay = 0,
+        worldBorderChange = 0;
 
-  private boolean
-    blockhunt = false;
+    private boolean
+        blockhunt = false;
 
-  private List<Material>
-    blockhuntBlocks = new ArrayList<>();
+    private List<Material>
+        blockhuntBlocks = new ArrayList<>();
 
-  private final Border
-    worldBorder;
+    private final Border
+        worldBorder;
 
-  private final WorldLoader
-    worldLoader;
+    private final WorldLoader
+        worldLoader;
 
-  public Map(String name) {
-    this.name = name;
-    this.worldBorder = new Border(this);
-    this.worldLoader = new WorldLoader(this);
-  }
+    public Map(String name) {
+        this.name = name;
+        this.worldBorder = new Border(this);
+        this.worldLoader = new WorldLoader(this);
+    }
 
-  public void setSpawn(Location pos) {
-    this.spawnPosition = pos;
-  }
+    public void setSpawn(Location pos) {
+        this.spawnPosition = pos;
+    }
 
-  public void setLobby(Location pos) {
-    this.lobbyPosition = pos;
-  }
+    public void setLobby(Location pos) {
+        this.lobbyPosition = pos;
+    }
 
-  public void setSeekerLobby(Location pos) {
-    this.seekerLobbyPosition = pos;
-  }
+    public void setSeekerLobby(Location pos) {
+        this.seekerLobbyPosition = pos;
+    }
 
-  public void setWorldBorderData(int x, int z, int size, int delay, int move) {
-    if(size < 1) {
-      this.worldBorderSize = 0;
-      this.worldBorderDelay = 0;
-      this.worldBorderChange = 0;
-      this.xWorldBorder = 0;
-      this.zWorldBorder = 0;
-    } else {
-      this.worldBorderSize = size;
-      this.worldBorderDelay = delay;
-      this.worldBorderChange = move;
-      this.xWorldBorder = x;
-      this.zWorldBorder = z;
+    public void setWorldBorderData(int x, int z, int size, int delay, int move) {
+        if(size < 1) {
+            this.worldBorderSize = 0;
+            this.worldBorderDelay = 0;
+            this.worldBorderChange = 0;
+            this.xWorldBorder = 0;
+            this.zWorldBorder = 0;
+        } else {
+            this.worldBorderSize = size;
+            this.worldBorderDelay = delay;
+            this.worldBorderChange = move;
+            this.xWorldBorder = x;
+            this.zWorldBorder = z;
+        }
+        this.worldBorder.resetWorldBorder();
     }
-    this.worldBorder.resetWorldBorder();
-  }
 
-  public void setBlockhunt(boolean enabled, List<Material> blocks) {
-    if (Main.getInstance().supports(9)) {
-      this.blockhunt = enabled;
-    } else {
-      this.blockhunt = false;
+    public void setBlockhunt(boolean enabled, List<Material> blocks) {
+        if (Main.getInstance().supports(9)) {
+            this.blockhunt = enabled;
+        } else {
+            this.blockhunt = false;
+        }
+        this.blockhuntBlocks = blocks;
     }
-    this.blockhuntBlocks = blocks;
-  }
 
-  public void setBoundMin(int x, int z) {
-    this.xBoundMin = x;
-    this.zBoundMin = z;
-  }
+    public void setBoundMin(int x, int z) {
+        this.xBoundMin = x;
+        this.zBoundMin = z;
+    }
 
-  public void setBoundMax(int x, int z) {
-    this.xBoundMax = x;
-    this.zBoundMax = z;
-  }
+    public void setBoundMax(int x, int z) {
+        this.xBoundMax = x;
+        this.zBoundMax = z;
+    }
 
-  @NotNull
-  public Location getGameSpawn() {
-    if(mapSaveEnabled) {
-      return spawnPosition.changeWorld("hs_"+name);
-    } else {
-      return spawnPosition;
+    @NotNull
+    public Location getGameSpawn() {
+        if(mapSaveEnabled) {
+            return spawnPosition.changeWorld("hs_"+name);
+        } else {
+            return spawnPosition;
+        }
     }
-  }
 
-  @NotNull
-  public String getGameSpawnName() {
-    if(mapSaveEnabled)
-      return getGameSpawn().getWorld();
-    else
-      return getSpawn().getWorld();
-  }
+    @NotNull
+    public String getGameSpawnName() {
+        if(mapSaveEnabled)
+            return getGameSpawn().getWorld();
+        else
+            return getSpawn().getWorld();
+    }
 
-  @NotNull
-  public Location getSpawn() {
-    return spawnPosition;
-  }
+    @NotNull
+    public Location getSpawn() {
+        return spawnPosition;
+    }
 
-  @NotNull
-  public String getSpawnName() {
-    return getSpawn().getWorld();
-  }
+    @NotNull
+    public String getSpawnName() {
+        return getSpawn().getWorld();
+    }
 
-  @NotNull
-  public Location getLobby() {
-    return lobbyPosition;
-  }
+    @NotNull
+    public Location getLobby() {
+        return lobbyPosition;
+    }
 
-  @NotNull
-  public String getLobbyName() {
-    return getLobby().getWorld();
-  }
+    @NotNull
+    public String getLobbyName() {
+       return getLobby().getWorld();
+    }
 
-  @NotNull
-  public Location getSeekerLobby() {
-    return seekerLobbyPosition;
-  }
+    @NotNull
+    public Location getSeekerLobby() {
+        return seekerLobbyPosition;
+    }
 
-  @NotNull
-  public String getSeekerLobbyName() {
-    return getSeekerLobby().getWorld();
-  }
+    @NotNull
+    public String getSeekerLobbyName() {
+       return getSeekerLobby().getWorld();
+    }
 
-  @NotNull
-  public Location getGameSeekerLobby() {
-    if(mapSaveEnabled) {
-      return seekerLobbyPosition.changeWorld("hs_"+name);
-    } else {
-      return seekerLobbyPosition;
+    @NotNull
+    public Location getGameSeekerLobby() {
+        if(mapSaveEnabled) {
+          return seekerLobbyPosition.changeWorld("hs_"+name);
+       } else {
+         return seekerLobbyPosition;
+       }
     }
-  }
 
-  public boolean isWorldBorderEnabled() {
-    return worldBorderSize > 0;
-  }
+    public boolean isWorldBorderEnabled() {
+      return worldBorderSize > 0;
+    }
 
-  @NotNull
-  public Vector getWorldBorderPos() {
-    return new Vector(
-      xWorldBorder,
-      0,
-      zWorldBorder
-    );
-  }
+    @NotNull
+    public Vector getWorldBorderPos() {
+       return new Vector(
+          xWorldBorder,
+          0,
+           zWorldBorder
+       );
+    }
 
-  @NotNull
-  public Vector getWorldBorderData() {
-    return new Vector(
-      worldBorderSize,
-      worldBorderDelay,
-      worldBorderChange
-    );
-  }
+    @NotNull
+    public Vector getWorldBorderData() {
+       return new Vector(
+          worldBorderSize,
+          worldBorderDelay,
+          worldBorderChange
+        );
+    }
 
-  @NotNull
-  public Border getWorldBorder() {
-    return worldBorder;
-  }
+    @NotNull
+    public Border getWorldBorder() {
+        return worldBorder;
+    }
 
-  public boolean isBlockHuntEnabled() {
-    return blockhunt;
-  }
+    public boolean isBlockHuntEnabled() {
+        return blockhunt;
+    }
 
-  @NotNull
-  public List<Material> getBlockHunt() {
-    return blockhuntBlocks;
-  }
+    @NotNull
+    public List<Material> getBlockHunt() {
+        return blockhuntBlocks;
+    }
 
-  @NotNull
-  public Vector getBoundsMin() {
-    return new Vector(
-      xBoundMin,
-      0,
-      zBoundMin
-    );
-  }
+    @NotNull
+    public Vector getBoundsMin() {
+        return new Vector(
+          xBoundMin,
+          0,
+          zBoundMin
+        );
+    }
 
-  @NotNull
-  public Vector getBoundsMax() {
-    return new Vector(
-      xBoundMax,
-      0,
-      zBoundMax
-    );
-  }
+    @NotNull
+    public Vector getBoundsMax() {
+        return new Vector(
+            xBoundMax,
+            0,
+            zBoundMax
+        );
+    }
 
-  @NotNull
-  public String getName() {
-    return name;
-  }
+    @NotNull
+    public String getName() {
+        return name;
+    }
 
-  @NotNull
-  public WorldLoader getWorldLoader() {
-    return worldLoader;
-  }
+    @NotNull
+    public WorldLoader getWorldLoader() {
+        return worldLoader;
+    }
 
-  public boolean isNotSetup() {
-    if (spawnPosition.getBlockX() == 0 && spawnPosition.getBlockY() == 0 && spawnPosition.getBlockZ() == 0 || !spawnPosition.exists()) return true;
-    if (lobbyPosition.getBlockX() == 0 && lobbyPosition.getBlockY() == 0 && lobbyPosition.getBlockZ() == 0 || !lobbyPosition.exists()) return true;
-    if (exitPosition == null || exitPosition.getBlockX() == 0 && exitPosition.getBlockY() == 0 && exitPosition.getBlockZ() == 0 || !exitPosition.exists()) return true;
-    if (seekerLobbyPosition.getBlockX() == 0 && seekerLobbyPosition.getBlockY() == 0 && seekerLobbyPosition.getBlockZ() == 0 || !seekerLobbyPosition.exists()) return true;
-    if (mapSaveEnabled && !getGameSpawn().exists()) return true;
-    if (blockhunt && blockhuntBlocks.isEmpty()) return true;
-    if(isWorldBorderEnabled() &&
-        new Vector(spawnPosition.getX(), 0, spawnPosition.getZ()).distance(new Vector(xWorldBorder, 0, zWorldBorder)) > 100) return true;
-    return xBoundMin == 0 || zBoundMin == 0 || xBoundMax == 0 || zBoundMax == 0;
-  }
+    public boolean isNotSetup() {
+        if (spawnPosition.getBlockX() == 0 && spawnPosition.getBlockY() == 0 && spawnPosition.getBlockZ() == 0 || !spawnPosition.exists()) return true;
+        if (lobbyPosition.getBlockX() == 0 && lobbyPosition.getBlockY() == 0 && lobbyPosition.getBlockZ() == 0 || !lobbyPosition.exists()) return true;
+        if (exitPosition == null || exitPosition.getBlockX() == 0 && exitPosition.getBlockY() == 0 && exitPosition.getBlockZ() == 0 || !exitPosition.exists()) return true;
+        if (seekerLobbyPosition.getBlockX() == 0 && seekerLobbyPosition.getBlockY() == 0 && seekerLobbyPosition.getBlockZ() == 0 || !seekerLobbyPosition.exists()) return true;
+        if (mapSaveEnabled && !getGameSpawn().exists()) return true;
+        if (blockhunt && blockhuntBlocks.isEmpty()) return true;
+        if(isWorldBorderEnabled() &&
+            new Vector(spawnPosition.getX(), 0, spawnPosition.getZ()).distance(new Vector(xWorldBorder, 0, zWorldBorder)) > 100) return true;
+        return isBoundsNotSetup();
+    }
 
-  public boolean isBoundsNotSetup() {
-    return xBoundMin == 0 || zBoundMin == 0 || xBoundMax == 0 || zBoundMax == 0;
-  }
+    public boolean isBoundsNotSetup() {
+        if (xBoundMin == 0 || zBoundMin == 0 || xBoundMax == 0 || zBoundMax == 0) return true;
+        int xDiff = xBoundMax - xBoundMin;
+        int zDiff = zBoundMax - zBoundMin;
+        return xDiff < 5 || zDiff < 5;
+    }
 
 }
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
index e18a309..fbae413 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
@@ -186,7 +186,9 @@ public class Game {
 		PlayerLoader.unloadPlayer(player);
 		if(saveInventory) {
 			ItemStack[] data = Main.getInstance().getDatabase().getInventoryData().getInventory(player.getUniqueId());
-			player.getInventory().setContents(data);
+			try {
+				player.getInventory().setContents(data);
+			} catch (NullPointerException ignored){}
 		}
 		if (announceMessagesToNonPlayers) Bukkit.broadcastMessage(messagePrefix + message("GAME_LEAVE").addPlayer(player));
 		else broadcastMessage(messagePrefix + message("GAME_LEAVE").addPlayer(player));
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/listener/MovementHandler.java b/src/main/java/net/tylermurphy/hideAndSeek/game/listener/MovementHandler.java
index 1dd6cfc..290b679 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/listener/MovementHandler.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/listener/MovementHandler.java
@@ -51,7 +51,7 @@ public class MovementHandler implements Listener {
         if (!Main.getInstance().getBoard().contains(event.getPlayer())) return;
         if (!event.getPlayer().getWorld().getName().equals(Main.getInstance().getGame().getCurrentMap().getGameSpawnName())) return;
         if (!event.getTo().getWorld().getName().equals(Main.getInstance().getGame().getCurrentMap().getGameSpawnName())) return;
-        if (event.getPlayer().hasPermission("hideandseek.leavebounds")) return;
+        if (event.getPlayer().hasPermission("hs.leavebounds")) return;
         Map map = Main.getInstance().getGame().getCurrentMap();
         if (event.getTo().getBlockX() < map.getBoundsMin().getBlockX() || event.getTo().getBlockX() > map.getBoundsMax().getBlockX() || event.getTo().getBlockZ() < map.getBoundsMin().getZ() || event.getTo().getBlockZ() > map.getBoundsMax().getZ()) {
             event.setCancelled(true);
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/listener/PlayerHandler.java b/src/main/java/net/tylermurphy/hideAndSeek/game/listener/PlayerHandler.java
index d34cb11..64ed728 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/listener/PlayerHandler.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/listener/PlayerHandler.java
@@ -13,6 +13,9 @@ import org.bukkit.event.entity.ItemSpawnEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
 import org.bukkit.inventory.ItemStack;
 
+import static net.tylermurphy.hideAndSeek.configuration.Config.dropItems;
+import static net.tylermurphy.hideAndSeek.configuration.Config.regenHealth;
+
 public class PlayerHandler implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST)
@@ -25,6 +28,7 @@ public class PlayerHandler implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onPlayerRegainHealth(EntityRegainHealthEvent event) {
+        if (regenHealth) return;
         if (event.getRegainReason() == EntityRegainHealthEvent.RegainReason.SATIATED || event.getRegainReason() == EntityRegainHealthEvent.RegainReason.REGEN) {
             if (event.getEntity() instanceof Player) {
                 if (!Main.getInstance().getBoard().contains((Player) event.getEntity())) return;
@@ -35,7 +39,7 @@ public class PlayerHandler implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onItemDrop(PlayerDropItemEvent event) {
-        if (Main.getInstance().getBoard().contains(event.getPlayer())) {
+        if (!dropItems && Main.getInstance().getBoard().contains(event.getPlayer())) {
             event.setCancelled(true);
         }
     }
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/Location.java b/src/main/java/net/tylermurphy/hideAndSeek/util/Location.java
index 606b64b..916b6f9 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/Location.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/util/Location.java
@@ -11,6 +11,8 @@ import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 
+import static net.tylermurphy.hideAndSeek.configuration.Config.spawnPatch;
+
 public class Location {
 
     private final String world;
@@ -87,7 +89,11 @@ public class Location {
     public void teleport(Player player) {
         if(!exists()) return;
         if(load() == null) return;
-        player.teleport(toBukkit());
+        if (spawnPatch) {
+            Main.getInstance().scheduleTask(() -> player.teleport(toBukkit()));
+        } else {
+            player.teleport(toBukkit());
+        }
     }
 
     public Location changeWorld(String world) {
@@ -139,7 +145,7 @@ public class Location {
     }
 
     public boolean isNotInBounds(int xmin, int xmax, int zmin, int zmax) {
-        return getBlockX() < xmin || getBlockX() > xmax || getBlockZ() < zmin || getBlockZ() > zmax;
+        return getBlockX() <= xmin || getBlockX() >= xmax || getBlockZ() <= zmin || getBlockZ() >= zmax;
     }
 
 }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 82b9379..5316402 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -6,6 +6,11 @@
 # +--------------------------------------------------------+ #
 #============================================================#
 
+# If you are having weird issues with your server where it's printing to the console
+# "--- DO NOT REPORT THIS TO PAPER - THIS IS NOT A BUG OR A CRASH", try enabling the
+# below spawn patch. WARNING: this will NOT work if you use Multiverse Inventory's.
+spawnPatch: false
+
 # How long in seconds will the game last, set it < 1 to disable
 # default: 1200 aka 20min
 gameLength: 1200
@@ -14,6 +19,10 @@ gameLength: 1200
 # default: true
 announceMessagesToNonPlayers: true
 
+# Allow players to drop their items in game
+# default: false
+dropItems: false
+
 # When the game is starting, the plugin will state there is x seconds left to hide.
 # You change where countdown messages are to be displayed: in the chat, action bar, or a title.
 # Below you can set CHAT, ACTIONBAR, or TITLE. Any invalid option will revert to CHAT.
@@ -46,6 +55,10 @@ minPlayers: 2
 # default: true
 pvp: true
 
+# Allow players to regen health
+# default: false
+regenHealth: false
+
 # !! Only effects the game at all if pvp is set to false !!
 # By default, If you disable pvp, Hiders and Seekers can no longer take damage from natural causes such as
 # falling or projectiles. If you want, you can keep pvp disabled so that Seekers only have to tag Hiders, but
diff --git a/src/main/resources/maps.yml b/src/main/resources/maps.yml
index 8505162..a8d9865 100644
--- a/src/main/resources/maps.yml
+++ b/src/main/resources/maps.yml
@@ -1 +1,3 @@
+# PLEASE DO NOT EDIT THIS FILE
+# ONLY EDIT IF YOU KNOW WHAT YOU ARE DOING
 maps:
\ No newline at end of file
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index c6ce455..cf281af 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -72,4 +72,6 @@ permissions:
     default: op
   hs.confirm:
     default: op
+  hs.leavebounds:
+    default: false