various fixes

5 files changed, 14 insertions, 2 deletions

diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/ForceStart.java b/src/main/java/com/MylesAndMore/Tumble/commands/ForceStart.java
index 78ff183..a862268 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/ForceStart.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/ForceStart.java
@@ -35,6 +35,7 @@ public class ForceStart implements CommandExecutor, TabCompleter {
         }
 
         game.startGame();
+        sender.sendMessage(ChatColor.GREEN + "Starting game");
         return true;
     }
 
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java b/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java
index 7f266d7..8845e25 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java
@@ -35,6 +35,7 @@ public class ForceStop implements CommandExecutor, TabCompleter {
         }
 
         game.killGame();
+        sender.sendMessage(ChatColor.GREEN + "Game stopped.");
         return true;
     }
 
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/Leave.java b/src/main/java/com/MylesAndMore/Tumble/commands/Leave.java
index 94255a4..abf0592 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Leave.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Leave.java
@@ -40,6 +40,7 @@ public class Leave implements CommandExecutor, TabCompleter {
         }
 
         game.removePlayer((Player) sender);
+        sender.sendMessage(ChatColor.GREEN + "Game left.");
         return true;
     }
 
diff --git a/src/main/java/com/MylesAndMore/Tumble/game/EventListener.java b/src/main/java/com/MylesAndMore/Tumble/game/EventListener.java
index 16698f4..7e099e7 100644
--- a/src/main/java/com/MylesAndMore/Tumble/game/EventListener.java
+++ b/src/main/java/com/MylesAndMore/Tumble/game/EventListener.java
@@ -4,6 +4,7 @@ import java.util.Objects;
 
 import com.MylesAndMore.Tumble.plugin.ConfigManager;
 import com.MylesAndMore.Tumble.plugin.GameState;
+import com.MylesAndMore.Tumble.plugin.GameType;
 import org.bukkit.*;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Snowball;
@@ -73,6 +74,7 @@ public class EventListener implements Listener {
 
     @EventHandler
     public void ProjectileLaunchEvent(ProjectileLaunchEvent event) {
+        if (game.roundType != GameType.SNOWBALLS) { return; }
         if (event.getEntity().getWorld() == gameWorld
                 && event.getEntity() instanceof Snowball
                 && event.getEntity().getShooter() instanceof Player player) {
@@ -90,7 +92,7 @@ public class EventListener implements Listener {
 
     @EventHandler
     public void ProjectileHitEvent(ProjectileHitEvent event) {
-        if (event.getHitBlock() == null) { 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) {
@@ -142,6 +144,7 @@ public class EventListener implements Listener {
 
     @EventHandler
     public void PlayerInteractEvent(PlayerInteractEvent event) {
+        if (game.roundType != GameType.SHOVELS) {return;}
         // Remove blocks when clicked in the game world (all gamemodes require this functionality)
         if (event.getAction() == Action.LEFT_CLICK_BLOCK
                 && Objects.requireNonNull(event.getClickedBlock()).getWorld() == gameWorld) {
diff --git a/src/main/java/com/MylesAndMore/Tumble/game/Game.java b/src/main/java/com/MylesAndMore/Tumble/game/Game.java
index 6e46f8d..c58313e 100644
--- a/src/main/java/com/MylesAndMore/Tumble/game/Game.java
+++ b/src/main/java/com/MylesAndMore/Tumble/game/Game.java
@@ -1,6 +1,5 @@
 package com.MylesAndMore.Tumble.game;
 
-import com.MylesAndMore.Tumble.commands.Config;
 import com.MylesAndMore.Tumble.plugin.ConfigManager;
 import com.MylesAndMore.Tumble.plugin.GameState;
 import com.MylesAndMore.Tumble.plugin.GameType;
@@ -197,6 +196,12 @@ public class Game {
     public void killGame() {
         Bukkit.getServer().getScheduler().cancelTask(gameID);
         HandlerList.unregisterAll(eventListener);
+        clearInventories(gamePlayers);
+        for (Player aPlayer : gamePlayers) {
+            if (aPlayer.getWorld().equals(arena.world)) {
+                aPlayer.teleport(Objects.requireNonNull(ConfigManager.lobby));
+            }
+        }
         arena.game = null;
     }
 
@@ -210,6 +215,7 @@ public class Game {
         if (gamePlayers.size() < 2) {
             gameEnd();
         }
+        p.getInventory().clear();
         p.teleport(ConfigManager.lobby);
     }