From 8cb97b0bc66f6d29770e6994ee19cd0c3835055c Mon Sep 17 00:00:00 2001 From: sowgro Date: Sun, 9 Jun 2024 15:21:02 -0400 Subject: Fix waiting area --- src/main/java/com/MylesAndMore/Tumble/game/EventListener.java | 4 +--- src/main/java/com/MylesAndMore/Tumble/game/Game.java | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/MylesAndMore/Tumble/game/EventListener.java b/src/main/java/com/MylesAndMore/Tumble/game/EventListener.java index f538159..07cd77a 100644 --- a/src/main/java/com/MylesAndMore/Tumble/game/EventListener.java +++ b/src/main/java/com/MylesAndMore/Tumble/game/EventListener.java @@ -61,9 +61,7 @@ public class EventListener implements Listener { public void PlayerDeathEvent(PlayerDeathEvent event) { if (game.gamePlayers.contains(event.getEntity())) { game.playerDeath(event.getEntity()); - Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(plugin, () -> { - event.getEntity().spigot().respawn(); - }, 10); + Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(plugin, () -> event.getEntity().spigot().respawn(), 10); } } diff --git a/src/main/java/com/MylesAndMore/Tumble/game/Game.java b/src/main/java/com/MylesAndMore/Tumble/game/Game.java index 3efcd80..2774ce7 100644 --- a/src/main/java/com/MylesAndMore/Tumble/game/Game.java +++ b/src/main/java/com/MylesAndMore/Tumble/game/Game.java @@ -219,6 +219,9 @@ public class Game { public void addPlayer(Player p) { gamePlayers.add(p); + if (ConfigManager.waitArea != null) { + p.teleport(ConfigManager.waitArea); + } if (gamePlayers.size() >= 2 && gameState == GameState.WAITING) { autoStart(); } -- cgit v1.2.3