diff options
| -rw-r--r-- | src/main/java/com/MylesAndMore/Tumble/game/EventListener.java | 7 | ||||
| -rw-r--r-- | src/main/java/com/MylesAndMore/Tumble/game/Game.java | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/com/MylesAndMore/Tumble/game/EventListener.java b/src/main/java/com/MylesAndMore/Tumble/game/EventListener.java index 7e099e7..f538159 100644 --- a/src/main/java/com/MylesAndMore/Tumble/game/EventListener.java +++ b/src/main/java/com/MylesAndMore/Tumble/game/EventListener.java @@ -59,8 +59,11 @@ public class EventListener implements Listener { @EventHandler public void PlayerDeathEvent(PlayerDeathEvent event) { - if (event.getEntity().getWorld() == gameWorld) { + if (game.gamePlayers.contains(event.getEntity())) { game.playerDeath(event.getEntity()); + Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(plugin, () -> { + event.getEntity().spigot().respawn(); + }, 10); } } @@ -92,7 +95,7 @@ public class EventListener implements Listener { @EventHandler public void ProjectileHitEvent(ProjectileHitEvent event) { - if (event.getHitBlock() == null && game.roundType != GameType.SNOWBALLS) { return; } + if (event.getHitBlock() == null || game.roundType != GameType.SNOWBALLS) { return; } // Removes blocks that snowballs thrown by players have hit in the game world if (event.getHitBlock().getWorld() == gameWorld) { if (event.getEntity() instanceof Snowball) { diff --git a/src/main/java/com/MylesAndMore/Tumble/game/Game.java b/src/main/java/com/MylesAndMore/Tumble/game/Game.java index c58313e..3efcd80 100644 --- a/src/main/java/com/MylesAndMore/Tumble/game/Game.java +++ b/src/main/java/com/MylesAndMore/Tumble/game/Game.java @@ -56,9 +56,6 @@ public class Game { Bukkit.getServer().getScheduler().cancelTask(autoStartID); autoStartID = -1; -// if (waitingPlayers.size() < 2) { -// return false; -// } eventListener = new EventListener(this); Bukkit.getServer().getPluginManager().registerEvents(eventListener, plugin); @@ -175,6 +172,7 @@ public class Game { // Wait 10s (200t), then Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(plugin, () -> { // First, check to see if there is a separate location to tp the winner to + clearArena(); if (ConfigManager.winnerLobby != null && winner != null) { winner.teleport(ConfigManager.winnerLobby); // Remove the winner from the game so they don't get double-tp'd |