From dc0b46f8f92e9774268d1e6c5d7a571196f464bd Mon Sep 17 00:00:00 2001
From: Steev <mauricefl@outlook.de>
Date: Sun, 2 Jan 2022 02:05:05 +0100
Subject: [PATCH] fixed command throwing error, added more messaging

---
 plugin.yml                                      |  3 +--
 .../java/de/steev/Tridentwar/Tridentwar.java    |  2 +-
 .../Tridentwar/commands/TridentwarCommand.java  | 17 ++++++++++++-----
 .../steev/Tridentwar/manager/GameManager.java   |  6 +++++-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/plugin.yml b/plugin.yml
index ec34442..edda8d0 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -4,5 +4,4 @@ version: 0.1
 api-version: 1.13
 commands:
   tw:
-    description: "controlls plugin"
-    usage: /jobs <list, info, stats, join, leave>
\ No newline at end of file
+    description: "controlls plugin"
\ No newline at end of file
diff --git a/src/main/java/de/steev/Tridentwar/Tridentwar.java b/src/main/java/de/steev/Tridentwar/Tridentwar.java
index 7dd431e..3db95fa 100644
--- a/src/main/java/de/steev/Tridentwar/Tridentwar.java
+++ b/src/main/java/de/steev/Tridentwar/Tridentwar.java
@@ -17,7 +17,7 @@ public class Tridentwar extends JavaPlugin {
         getServer().getPluginManager().registerEvents(new ProjectileLaunchListener(this.gameManager, this), this);
         getServer().getPluginManager().registerEvents(new ProjectileHitListener(this.gameManager), this);
         getServer().getPluginManager().registerEvents(new PlayerDeathListener(this.gameManager), this);
-        getCommand("tw").setExecutor(new TridentwarCommand(gameManager));
+        getCommand("tw").setExecutor(new TridentwarCommand(this.gameManager));
     }
 
     @Override
diff --git a/src/main/java/de/steev/Tridentwar/commands/TridentwarCommand.java b/src/main/java/de/steev/Tridentwar/commands/TridentwarCommand.java
index 1cfb345..073eca3 100644
--- a/src/main/java/de/steev/Tridentwar/commands/TridentwarCommand.java
+++ b/src/main/java/de/steev/Tridentwar/commands/TridentwarCommand.java
@@ -15,12 +15,19 @@ public class TridentwarCommand implements CommandExecutor {
     }
 
     public boolean onCommand(CommandSender commandSender, Command command, String s, String[] args) {
-        if (args[0] == null) return false;
 
-        switch (args[0].toLowerCase()){
-            case "start":
-                gameManager.setGameState(GameState.STARTING);
-                break;
+        if(args.length >= 1) {
+            switch (args[0].toLowerCase()){
+                default:
+                    commandSender.sendMessage("use args: start");
+                    break;
+                case "start":
+                    System.out.println(args[0]);
+                    gameManager.setGameState(GameState.STARTING);
+                    break;
+            }
+        } else {
+            commandSender.sendMessage("Empty Commands are not allowed!");
         }
         return false;
     }
diff --git a/src/main/java/de/steev/Tridentwar/manager/GameManager.java b/src/main/java/de/steev/Tridentwar/manager/GameManager.java
index 7a9eab7..532f827 100644
--- a/src/main/java/de/steev/Tridentwar/manager/GameManager.java
+++ b/src/main/java/de/steev/Tridentwar/manager/GameManager.java
@@ -29,7 +29,11 @@ public class GameManager {
                 this.playerManager.giveKits();
                 break;
             case STARTING:
-                if(Bukkit.getOnlinePlayers().size() < 2) return; // TODO: Message about minimal player count not beeing reached
+                if(Bukkit.getOnlinePlayers().size() < 2) {
+                    // Message about minimal player count not beeing reached
+                    Bukkit.broadcastMessage("Game cannot be started with a single player");
+                    return;
+                }
                 Bukkit.broadcastMessage("Starting!");
                 this.gameStartCountdownTask = new GameStartCountdownTask(this);
                 this.gameStartCountdownTask.runTaskTimer(plugin, 0 , 20);