From 32218f9be09e2cce0b87487d2ca4e028abc863fc Mon Sep 17 00:00:00 2001
From: Lucas Nicodemus <shank@shanked.me>
Date: Sun, 8 Mar 2015 16:00:43 -0600
Subject: [PATCH] PlayerCommandEventArgs passes the command prefix

Fix tab space conflict in PlayerHooks.cs
---
 TShockAPI/Commands.cs          |   2 +-
 TShockAPI/Hooks/PlayerHooks.cs | 131 +++++++++++++++++----------------
 2 files changed, 67 insertions(+), 66 deletions(-)

diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index f186e688..c04f2b00 100755
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -623,7 +623,7 @@ namespace TShockAPI
 
 			IEnumerable<Command> cmds = ChatCommands.FindAll(c => c.HasAlias(cmdName));
 
-			if (Hooks.PlayerHooks.OnPlayerCommand(player, cmdName, cmdText, args, ref cmds))
+			if (Hooks.PlayerHooks.OnPlayerCommand(player, cmdName, cmdText, args, ref cmds, cmdPrefix))
 				return true;
 
 			if (cmds.Count() == 0)
diff --git a/TShockAPI/Hooks/PlayerHooks.cs b/TShockAPI/Hooks/PlayerHooks.cs
index 73e862a8..08c8ef64 100644
--- a/TShockAPI/Hooks/PlayerHooks.cs
+++ b/TShockAPI/Hooks/PlayerHooks.cs
@@ -21,30 +21,31 @@ using System.ComponentModel;
 
 namespace TShockAPI.Hooks
 {
-    public class PlayerPostLoginEventArgs
-    {
-        public TSPlayer Player { get; set; }
-        public PlayerPostLoginEventArgs(TSPlayer ply)
-        {
-            Player = ply;
-        }
-    }
+	public class PlayerPostLoginEventArgs
+	{
+		public TSPlayer Player { get; set; }
+		public PlayerPostLoginEventArgs(TSPlayer ply)
+		{
+			Player = ply;
+		}
+	}
 
-    public class PlayerPreLoginEventArgs : HandledEventArgs
-    {
-        public TSPlayer Player { get; set; }
-        public string LoginName { get; set; }
-        public string Password { get; set; }
-    }
+	public class PlayerPreLoginEventArgs : HandledEventArgs
+	{
+		public TSPlayer Player { get; set; }
+		public string LoginName { get; set; }
+		public string Password { get; set; }
+	}
 
-    public class PlayerCommandEventArgs : HandledEventArgs
-    {
-        public TSPlayer Player { get; set; }
-        public string CommandName { get; set; }
-        public string CommandText { get; set; }
-        public List<string> Parameters { get; set; }
+	public class PlayerCommandEventArgs : HandledEventArgs
+	{
+		public TSPlayer Player { get; set; }
+		public string CommandName { get; set; }
+		public string CommandText { get; set; }
+		public List<string> Parameters { get; set; }
 		public IEnumerable<Command> CommandList { get; set; }
-    }
+		public string CommandPrefix { get; set; }
+	}
 
 	public class PlayerChatEventArgs : HandledEventArgs
 	{
@@ -53,59 +54,59 @@ namespace TShockAPI.Hooks
 		public string TShockFormattedText { get; set; }
 	}
 
-    public static class PlayerHooks
-    {
-        public delegate void PlayerPostLoginD(PlayerPostLoginEventArgs e);
-        public static event PlayerPostLoginD PlayerPostLogin;
+	public static class PlayerHooks
+	{
+		public delegate void PlayerPostLoginD(PlayerPostLoginEventArgs e);
+		public static event PlayerPostLoginD PlayerPostLogin;
 
-        public delegate void PlayerPreLoginD(PlayerPreLoginEventArgs e);
-        public static event PlayerPreLoginD PlayerPreLogin;
+		public delegate void PlayerPreLoginD(PlayerPreLoginEventArgs e);
+		public static event PlayerPreLoginD PlayerPreLogin;
 
-        public delegate void PlayerCommandD(PlayerCommandEventArgs e);
-        public static event PlayerCommandD PlayerCommand;
+		public delegate void PlayerCommandD(PlayerCommandEventArgs e);
+		public static event PlayerCommandD PlayerCommand;
 
 		public delegate void PlayerChatD(PlayerChatEventArgs e);
 		public static event PlayerChatD PlayerChat;
 
-        public static void OnPlayerPostLogin(TSPlayer ply)
-        {
-            if (PlayerPostLogin == null)
-            {
-                return;
-            }
+		public static void OnPlayerPostLogin(TSPlayer ply)
+		{
+			if (PlayerPostLogin == null)
+			{
+					return;
+			}
 
-            PlayerPostLoginEventArgs args = new PlayerPostLoginEventArgs(ply);
-            PlayerPostLogin(args);
-        }
+			PlayerPostLoginEventArgs args = new PlayerPostLoginEventArgs(ply);
+			PlayerPostLogin(args);
+		}
 
-        public static bool OnPlayerCommand(TSPlayer player, string cmdName, string cmdText, List<string> args, ref IEnumerable<Command> commands)
-        {
-            if (PlayerCommand == null)
-            {
-                return false;
-            }
-            PlayerCommandEventArgs playerCommandEventArgs = new PlayerCommandEventArgs()
-            {
-                Player = player,
-                CommandName = cmdName,
-                CommandText = cmdText,
-                Parameters = args,
-				CommandList = commands
-            };
-            PlayerCommand(playerCommandEventArgs);
-        	commands = playerCommandEventArgs.CommandList;
-            return playerCommandEventArgs.Handled;
-        }
+		public static bool OnPlayerCommand(TSPlayer player, string cmdName, string cmdText, List<string> args, ref IEnumerable<Command> commands, string cmdPrefix)
+		{
+			if (PlayerCommand == null)
+			{
+				return false;
+			}
+			PlayerCommandEventArgs playerCommandEventArgs = new PlayerCommandEventArgs()
+			{
+				Player = player,
+				CommandName = cmdName,
+				CommandText = cmdText,
+				Parameters = args,
+				CommandList = commands,
+				CommandPrefix = cmdPrefix,
+			};
+			PlayerCommand(playerCommandEventArgs);
+			return playerCommandEventArgs.Handled;
+		}
 
-        public static bool OnPlayerPreLogin(TSPlayer ply, string name, string pass)
-        {
-            if (PlayerPreLogin == null)
-                return false;
+		public static bool OnPlayerPreLogin(TSPlayer ply, string name, string pass)
+		{
+			if (PlayerPreLogin == null)
+				return false;
 
-            var args = new PlayerPreLoginEventArgs {Player = ply, LoginName = name, Password = pass};
-            PlayerPreLogin(args);
-            return args.Handled;
-        }
+			var args = new PlayerPreLoginEventArgs {Player = ply, LoginName = name, Password = pass};
+			PlayerPreLogin(args);
+			return args.Handled;
+		}
 
 		public static void OnPlayerChat(TSPlayer ply, string rawtext, ref string tshockText)
 		{
@@ -116,5 +117,5 @@ namespace TShockAPI.Hooks
 			PlayerChat(args);
 			tshockText = args.TShockFormattedText;
 		}
-    }
+	}
 }