2 files changed, 14 insertions, 6 deletions
diff --git a/src/main/java/com/MylesAndMore/tumble/EventListener.java b/src/main/java/com/MylesAndMore/tumble/EventListener.java
index 4c3d154..bfe6767 100644
--- a/src/main/java/com/MylesAndMore/tumble/EventListener.java
+++ b/src/main/java/com/MylesAndMore/tumble/EventListener.java
@@ -13,6 +13,7 @@ import org.bukkit.event.entity.ProjectileLaunchEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
 import org.bukkit.event.player.PlayerItemDamageEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.ItemStack;
 
@@ -86,7 +87,6 @@ public class EventListener implements Listener{
         }
     }
 
-
     @EventHandler
     public void PlayerDropItemEvent(PlayerDropItemEvent event) {
         // When an item is dropped, make sure there is a defined gameWorld
@@ -98,6 +98,15 @@ public class EventListener implements Listener{
             }
         }
     }
+
+    @EventHandler
+    public void PlayerMoveEvent(PlayerMoveEvent event) {
+        // On a PlayerMoveEvent, check if the game is starting
+        if (Objects.equals(Game.getGame().getGameState(), "starting")) {
+            // Cancel the event if the game is starting (so players can't move before the game starts)
+            event.setCancelled(true);
+        }
+    }
 }
 
 
diff --git a/src/main/java/com/MylesAndMore/tumble/Game.java b/src/main/java/com/MylesAndMore/tumble/Game.java
index d3234a1..1b8227e 100644
--- a/src/main/java/com/MylesAndMore/tumble/Game.java
+++ b/src/main/java/com/MylesAndMore/tumble/Game.java
@@ -114,7 +114,7 @@ public class Game {
         // Create a list that will later keep track of each player's wins
         gameWins = new ArrayList<>();
         gameWins.addAll(List.of(0,0,0,0,0,0,0,0));
-        // Wait 5s (50t) for the clients to load in
+        // Wait 5s (100t) for the clients to load in
         Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(TumbleManager.getPlugin(), () -> {
             // Display the "go!" title
             displayTitles(gamePlayers, ChatColor.GREEN + "Go!", null, 1, 5, 1);
@@ -122,7 +122,7 @@ public class Game {
             // Set gamemodes to survival
             setGamemode(gamePlayers, GameMode.SURVIVAL);
             gameState = "running";
-        }, 50);
+        }, 100);
         return true;
     }
 
@@ -336,7 +336,7 @@ public class Game {
         // Announce win
         displayTitles(gamePlayers, ChatColor.RED + "Game over!", ChatColor.GOLD + winner.getName() + " has won the game!", 4, 40, 2);
         displayMessage(gamePlayers, ChatColor.BLUE + "Teleporting back in five seconds...");
-        // Wait 5s (100t), then
+        // Wait 10s (200t), then
         Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(TumbleManager.getPlugin(), () -> {
             // Set their gamemodes to survival
             setGamemode(gamePlayers, GameMode.SURVIVAL);
@@ -344,8 +344,7 @@ public class Game {
             for (Player aPlayer : gamePlayers) {
                 aPlayer.teleport(Bukkit.getWorld(TumbleManager.getLobbyWorld()).getSpawnLocation());
             }
-        }, 100);
+        }, 200);
         gameState = "complete";
     }
-
 }