diff options
4 files changed, 11 insertions, 7 deletions
@@ -111,7 +111,7 @@ <dependency> <groupId>org.xerial</groupId> <artifactId>sqlite-jdbc</artifactId> - <version>3.39.3.0</version> + <version>3.40.1.0</version> </dependency> <dependency> <groupId>org.jetbrains</groupId> @@ -121,23 +121,23 @@ <dependency> <groupId>com.github.cryptomorin</groupId> <artifactId>XSeries</artifactId> - <version>9.1.0</version> + <version>9.2.0</version> </dependency> <dependency> <groupId>me.clip</groupId> <artifactId>placeholderapi</artifactId> - <version>2.11.1</version> + <version>2.11.2</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.zaxxer</groupId> <artifactId>HikariCP</artifactId> - <version>5.0.1</version> + <version>4.0.3</version> </dependency> <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> - <version>3.0.6</version> + <version>3.1.2</version> </dependency> </dependencies> </project>
\ No newline at end of file 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); } |