update dependicies, fix worldborder, fix timer when player leaves, fix drop items

3 files changed, 6 insertions, 2 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/map/set/Border.java b/src/main/java/net/tylermurphy/hideAndSeek/command/map/set/Border.java
index 64bf5d4..2c05115 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/map/set/Border.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/map/set/Border.java
@@ -36,7 +36,7 @@ public class Border implements ICommand {
 			addToConfig("worldBorder.enabled",false);
 			saveConfig();
 			sender.sendMessage(messagePrefix + message("WORLDBORDER_DISABLE"));
-			Main.getInstance().getGame().getCurrentMap().getWorldBorder().resetWorldBorder();
+			map.getWorldBorder().resetWorldBorder();
 			return;
 		}
 		int num,delay,change;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
index fbae413..41df9b8 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
@@ -242,6 +242,9 @@ public class Game {
 			}
 		} else {
 			lobbyTimer = -1;
+			if (gameTick % 20 == 0) {
+				board.reloadLobbyBoards();
+			}
 		}
 	}
 
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 64ed728..760f1f9 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/listener/PlayerHandler.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/listener/PlayerHandler.java
@@ -48,7 +48,8 @@ public class PlayerHandler implements Listener {
     public void onItemSpawn(ItemSpawnEvent event){
         if(Main.getInstance().getGame().getStatus() == Status.STANDBY) return;
         ItemStack item = event.getEntity().getItemStack();
-        if(!Items.matchItem(item)) return;
+        if (!Items.matchItem(item)) return;
+        if (dropItems) return;
         event.setCancelled(true);
     }