Made command paths a bit more logical

src/main/java/buttondevteam/chat/commands/CommandCaller.java

@@ -1,6 +1,8 @@
 package buttondevteam.chat.commands;
 
 import java.util.Arrays;
+import java.util.Map.Entry;
+
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -23,13 +25,20 @@ public class CommandCaller implements CommandExecutor {
 	public static void RegisterCommands() {
 		if (instance == null)
 			instance = new CommandCaller();
-		for (TBMCCommandBase c : TBMCChatAPI.GetCommands().values()) {
+		for (Entry<String, TBMCCommandBase> entry : TBMCChatAPI.GetCommands().entrySet()) {
-			if (!c.GetCommandPath().contains("/")) // Top-level command
+			TBMCCommandBase c = entry.getValue();
+			if (c == null) {
+				TBMCCoreAPI.SendException("An error occured while registering commands",
+						new Exception("Null command found at " + entry.getKey() + "!"));
+				continue;
+			}
+			if (!c.GetCommandPath().contains(" ")) // Top-level command
 			{
 				PluginCommand pc = ((JavaPlugin) c.getPlugin()).getCommand(c.GetCommandPath());
 				if (pc == null)
-					new Exception("Can't find top-level command: " + c.GetCommandPath() + " for plugin: "
+					TBMCCoreAPI.SendException("An error occured while registering commands",
-							+ c.getPlugin().getName()).printStackTrace();
+							new Exception("Can't find top-level command: " + c.GetCommandPath() + " for plugin: "
+									+ c.getPlugin().getName()));
 				else
 					pc.setExecutor(instance);
 			}

src/main/java/buttondevteam/chat/commands/ucmds/HelpCommand.java

@@ -33,7 +33,7 @@ public final class HelpCommand extends UCommandBase {
 			ArrayList<String> text = new ArrayList<String>();
 			text.add("§6---- Command list ----");
 			for (TBMCCommandBase cmd : TBMCChatAPI.GetCommands().values())
-				if (!cmd.GetCommandPath().contains("/"))
+				if (!cmd.GetCommandPath().contains(" "))
 					text.add("/" + cmd.GetCommandPath());
 			sender.sendMessage(text.toArray(new String[text.size()]));
 		} else if (args[0].equalsIgnoreCase("colors")) {

src/main/java/buttondevteam/chat/commands/ucmds/UCommandBase.java

@@ -8,7 +8,7 @@ public abstract class UCommandBase extends TBMCCommandBase {
 
 	@Override
 	public String GetCommandPath() {
-		return "u/" + GetUCommandPath();
+		return "u " + GetUCommandPath();
 	}
 
 	public abstract String GetUCommandPath();

src/main/java/buttondevteam/chat/commands/ucmds/admin/AdminCommandBase.java

@@ -8,7 +8,7 @@ public abstract class AdminCommandBase extends UCommandBase {
 
 	@Override
 	public String GetUCommandPath() {
-		return "admin/" + GetAdminCommandPath();
+		return "admin " + GetAdminCommandPath();
 	}
 
 	@Override

src/main/java/buttondevteam/chat/commands/ucmds/announce/AnnounceCommandBase.java

@@ -8,7 +8,7 @@ public abstract class AnnounceCommandBase extends UCommandBase {
 
 	@Override
 	public String GetUCommandPath() {
-		return "announce/" + GetAnnounceCommandPath();
+		return "announce " + GetAnnounceCommandPath();
 	}
 
 	public abstract String GetAnnounceCommandPath();