From ffbee4a9aa96737ccf773f2546f093b5c9bda038 Mon Sep 17 00:00:00 2001
From: Ben Sihota <contact@horusdev.com>
Date: Tue, 7 Jul 2015 18:20:27 -0700
Subject: [PATCH] Add more details to /game Fix NPE with /game set

---
 Plugins/.idea/artifacts/Mineplex_Hub_jar.xml  |  1 +
 Plugins/.idea/codeStyleSettings.xml           |  5 ++--
 .../game/arcade/command/GameCommand.java      |  8 +++++-
 .../game/arcade/command/SetCommand.java       | 25 +++++++++----------
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/Plugins/.idea/artifacts/Mineplex_Hub_jar.xml b/Plugins/.idea/artifacts/Mineplex_Hub_jar.xml
index a90117bcf..150c21bc3 100644
--- a/Plugins/.idea/artifacts/Mineplex_Hub_jar.xml
+++ b/Plugins/.idea/artifacts/Mineplex_Hub_jar.xml
@@ -19,6 +19,7 @@
       <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/gson-2.2.1.jar" path-in-jar="/" />
       <element id="module-output" name="Mineplex.Database" />
       <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/jooq-3.5.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-dbcp2-2.0.1.jar" path-in-jar="/" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/Plugins/.idea/codeStyleSettings.xml b/Plugins/.idea/codeStyleSettings.xml
index a206a6aca..8e890f86b 100644
--- a/Plugins/.idea/codeStyleSettings.xml
+++ b/Plugins/.idea/codeStyleSettings.xml
@@ -37,7 +37,6 @@
         </codeStyleSettings>
       </value>
     </option>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Mineplex" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/GameCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/GameCommand.java
index 50fbfe062..ec1eb238f 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/GameCommand.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/GameCommand.java
@@ -1,5 +1,7 @@
 package nautilus.game.arcade.command;
 
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
 import org.bukkit.entity.Player;
 
 import nautilus.game.arcade.ArcadeManager;
@@ -20,6 +22,10 @@ public class GameCommand extends MultiCommandBase<ArcadeManager>
 	@Override
 	protected void Help(Player caller, String[] args)
 	{
-
+		UtilPlayer.message(caller, F.main(Plugin.getName(), "Commands List:"));
+		UtilPlayer.message(caller, F.help("/game start", "Start the current game", Rank.ADMIN));
+		UtilPlayer.message(caller, F.help("/game stop", "Stop the current game", Rank.ADMIN));
+		UtilPlayer.message(caller, F.help("/game set <GameType> (Map)", "Set the current game or next game", Rank.ADMIN));
+		UtilPlayer.message(caller, F.main("Tip", "Use TAB for games/maps!"));
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java
index e49c88b6d..7db88b496 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java
@@ -1,19 +1,18 @@
 package nautilus.game.arcade.command;
 
-import java.util.ArrayList;
-import java.util.List;
-
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.GameType;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import nautilus.game.arcade.ArcadeManager;
-import nautilus.game.arcade.GameType;
-import nautilus.game.arcade.game.Game.GameState;
-import mineplex.core.command.CommandBase;
-import mineplex.core.common.Rank;
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.UtilPlayer;
+import java.util.ArrayList;
+import java.util.List;
 
 public class SetCommand extends CommandBase<ArcadeManager>
 { 
@@ -28,9 +27,9 @@ public class SetCommand extends CommandBase<ArcadeManager>
 		if (Plugin.GetGame() == null)
 			return;
 		 
-		if (args.length == 0)
+		if (args == null || args.length == 0)
 		{
-			caller.sendMessage("/game set <GameType> (Map)");
+			caller.sendMessage(F.help("/game set <GameType> (Map)", "Set the current game or next game", Rank.ADMIN));
 			return; 
 		}
 		
@@ -43,7 +42,7 @@ public class SetCommand extends CommandBase<ArcadeManager>
 		}
 		
 		//Parse Game
-		ArrayList<GameType> matches = new ArrayList<GameType>();
+		ArrayList<GameType> matches = new ArrayList<>();
 		for (GameType type : GameType.values())
 		{
 			if (type.toString().toLowerCase().equals(game))