From 9c2ee337844dfd98ca95de27645eb2bb36dee836 Mon Sep 17 00:00:00 2001
From: MarioE <MarioE27@hotmail.com>
Date: Sun, 10 Nov 2013 23:19:27 -0500
Subject: [PATCH] Add /ban help

---
 TShockAPI/Commands.cs | 39 +++++++++++++++++++++++++++++----------
 TShockAPI/TShock.cs   |  2 +-
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index 2f3d6db6..8a73e8ce 100755
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -1072,16 +1072,7 @@ namespace TShockAPI
 
 		private static void Ban(CommandArgs args)
 		{
-			if (args.Parameters.Count == 0 || args.Parameters[0].ToLower() == "help")
-			{
-				args.Player.SendInfoMessage("Syntax: /ban [option] [arguments]");
-				args.Player.SendInfoMessage("Options: list, listip, clear, add, addip, del, delip");
-				args.Player.SendInfoMessage("Arguments: list, listip, clear [code], add [name], addip [ip], del [name], delip [name]");
-				args.Player.SendInfoMessage("In addition, a reason may be provided for all new bans after the arguments.");
-				return;
-			}
-
-			string subcmd = args.Parameters[0].ToLower();
+			string subcmd = args.Parameters.Count == 0 ? "help" : args.Parameters[0].ToLower();
 			switch (subcmd)
 			{
 				case "add":
@@ -1218,6 +1209,34 @@ namespace TShockAPI
 						#endregion
 					}
 					return;
+				case "help":
+					{
+						#region Help
+						int pageNumber;
+						if (!PaginationTools.TryParsePageNumber(args.Parameters, 1, args.Player, out pageNumber))
+							return;
+
+						var lines = new List<string>
+						{
+							"add <player> [reason] - Bans a player.",
+							"addip <ip> [reason] - Bans an IP.",
+							"addtemp <player> <time> [reason] - Temporarily bans a player.",
+							"del <player> - Unbans a player.",
+							"delip <ip> - Unbans an IP.",
+							"list [page] - Lists all player bans.",
+							"listip [page] - Lists all IP bans."
+                        };
+						
+						PaginationTools.SendPage(args.Player, pageNumber, lines,
+							new PaginationTools.Settings
+							{
+								HeaderFormat = "Ban Sub-Commands ({0}/{1}):",
+								FooterFormat = "Type /ban help {0} for more sub-commands."
+							}
+						);
+						#endregion
+					}
+					return;
 				case "list":
 					{
 						#region List bans
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 5cce49a9..a18631f2 100755
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -951,7 +951,7 @@ namespace TShockAPI
 			    {
 			        DateTime exp;
 			        string duration = DateTime.TryParse(ban.Expiration, out exp) ? String.Format("until {0}", exp.ToString("G")) : "forever";
-			        Utils.ForceKick(player, string.Format("You are banned {0}: {1}", duration, ban.Reason), true, false);
+					player.Disconnect(String.Format("Banned {0}: {1}", duration, ban.Reason));
 					args.Handled = true;
 			    }
 			}