Index: binary-improvements/AllocsCommands/Commands/Give.cs =================================================================== --- binary-improvements/AllocsCommands/Commands/Give.cs (revision 371) +++ (revision ) @@ -1,82 +1,0 @@ -using System; -using System.Collections.Generic; -using UnityEngine; - -namespace AllocsFixes.CustomCommands { - public class Give : ConsoleCmdAbstract { - public override string GetDescription () { - return "give an item to a player (entity id or name)"; - } - - public override string GetHelp () { - return "Give an item to a player by dropping it in front of that player\n" + - "Usage:\n" + - " give \n" + - " give \n" + - "Either pass the full name of a player or his entity id (given by e.g. \"lpi\").\n" + - "Item name has to be the exact name of an item as listed by \"listitems\".\n" + - "Amount is the number of instances of this item to drop (as a single stack).\n" + - "Quality is the quality of the dropped items for items that have a quality."; - } - - public override string[] GetCommands () { - return new[] {"give", string.Empty}; - } - - public override void Execute (List _params, CommandSenderInfo _senderInfo) { - if (_params.Count != 3 && _params.Count != 4) { - SdtdConsole.Instance.Output ("Wrong number of arguments, expected 3 or 4, found " + _params.Count + - "."); - return; - } - - ClientInfo ci = ConsoleHelper.ParseParamIdOrName (_params [0]); - - if (ci == null) { - SdtdConsole.Instance.Output ("Playername or entity id not found."); - return; - } - - ItemValue iv = ItemClass.GetItem (_params [1], true); - if (iv.type == ItemValue.None.type) { - SdtdConsole.Instance.Output ("Item not found."); - return; - } - - iv = new ItemValue (iv.type, true); - - int n; - if (!int.TryParse (_params [2], out n) || n <= 0) { - SdtdConsole.Instance.Output ("Amount is not an integer or not greater than zero."); - return; - } - - int quality = Constants.cItemMaxQuality; - - if (_params.Count == 4) { - if (!int.TryParse (_params [3], out quality) || quality <= 0) { - SdtdConsole.Instance.Output ("Quality is not an integer or not greater than zero."); - return; - } - } - - if (ItemClass.list [iv.type].HasSubItems) { - for (int i = 0; i < iv.Modifications.Length; i++) { - ItemValue tmp = iv.Modifications [i]; - tmp.Quality = quality; - iv.Modifications [i] = tmp; - } - } else if (ItemClass.list [iv.type].HasQuality) { - iv.Quality = quality; - } - - EntityPlayer p = GameManager.Instance.World.Players.dict [ci.entityId]; - - ItemStack invField = new ItemStack (iv, n); - - GameManager.Instance.ItemDropServer (invField, p.GetPosition (), Vector3.zero); - - SdtdConsole.Instance.Output ("Dropped item"); - } - } -} Index: binary-improvements/AllocsCommands/Commands/ListItems.cs =================================================================== --- binary-improvements/AllocsCommands/Commands/ListItems.cs (revision 371) +++ (revision ) @@ -1,44 +1,0 @@ -using System; -using System.Collections.Generic; - -namespace AllocsFixes.CustomCommands { - public class ListItems : ConsoleCmdAbstract { - public override string GetDescription () { - return "lists all items that contain the given substring"; - } - - public override string[] GetCommands () { - return new[] {"listitems", "li"}; - } - - public override string GetHelp () { - return "List all available item names\n" + - "Usage:\n" + - " 1. listitems \n" + - " 2. listitems *\n" + - "1. List only names that contain the given string.\n" + - "2. List all names."; - } - - public override void Execute (List _params, CommandSenderInfo _senderInfo) { - if (_params.Count != 1 || _params [0].Length == 0) { - SdtdConsole.Instance.Output ("Usage: listitems "); - return; - } - - int count = ItemClass.ItemNames.Count; - bool showAll = _params [0].Trim ().Equals ("*"); - - int listed = 0; - for (int i = 0; i < count; i++) { - string s = ItemClass.ItemNames [i]; - if (showAll || s.IndexOf (_params [0], StringComparison.OrdinalIgnoreCase) >= 0) { - SdtdConsole.Instance.Output (" " + s); - listed++; - } - } - - SdtdConsole.Instance.Output ("Listed " + listed + " matching items."); - } - } -} Index: binary-improvements/AllocsCommands/Commands/ListKnownPlayers.cs =================================================================== --- binary-improvements/AllocsCommands/Commands/ListKnownPlayers.cs (revision 371) +++ binary-improvements/AllocsCommands/Commands/ListKnownPlayers.cs (revision 420) @@ -4,9 +4,9 @@ namespace AllocsFixes.CustomCommands { public class ListKnownPlayers : ConsoleCmdAbstract { - public override string GetDescription () { + protected override string getDescription () { return "lists all players that were ever online"; } - public override string GetHelp () { + protected override string getHelp () { return "Usage:\n" + " 1. listknownplayers\n" + @@ -20,5 +20,5 @@ } - public override string[] GetCommands () { + protected override string[] getCommands () { return new[] {"listknownplayers", "lkp"}; } @@ -61,5 +61,5 @@ if ( (!onlineOnly || p.IsOnline) - && (!notBannedOnly || !admTools.IsBanned (kvp.Key, out _, out _)) + && (!notBannedOnly || !admTools.Blacklist.IsBanned (kvp.Key, out _, out _)) && (nameFilter.Length == 0 || p.Name.ContainsCaseInsensitive (nameFilter)) ) { Index: binary-improvements/AllocsCommands/Commands/ListLandProtection.cs =================================================================== --- binary-improvements/AllocsCommands/Commands/ListLandProtection.cs (revision 371) +++ binary-improvements/AllocsCommands/Commands/ListLandProtection.cs (revision 420) @@ -5,9 +5,9 @@ namespace AllocsFixes.CustomCommands { public class ListLandProtection : ConsoleCmdAbstract { - public override string GetDescription () { + protected override string getDescription () { return "lists all land protection blocks and owners"; } - public override string GetHelp () { + protected override string getHelp () { return "Usage:\n" + " 1. listlandprotection summary\n" + @@ -20,5 +20,5 @@ } - public override string[] GetCommands () { + protected override string[] getCommands () { return new[] {"listlandprotection", "llp"}; } Index: binary-improvements/AllocsCommands/Commands/RemoveLandProtection.cs =================================================================== --- binary-improvements/AllocsCommands/Commands/RemoveLandProtection.cs (revision 371) +++ binary-improvements/AllocsCommands/Commands/RemoveLandProtection.cs (revision 420) @@ -5,9 +5,9 @@ namespace AllocsFixes.CustomCommands { public class RemoveLandProtection : ConsoleCmdAbstract { - public override string GetDescription () { + protected override string getDescription () { return "removes the association of a land protection block to the owner"; } - public override string GetHelp () { + protected override string getHelp () { return "Usage:" + " 1. removelandprotection \n" + @@ -19,5 +19,5 @@ } - public override string[] GetCommands () { + protected override string[] getCommands () { return new[] {"removelandprotection", "rlp"}; } Index: binary-improvements/AllocsCommands/Commands/Reply.cs =================================================================== --- binary-improvements/AllocsCommands/Commands/Reply.cs (revision 371) +++ (revision ) @@ -1,44 +1,0 @@ -using System.Collections.Generic; - -namespace AllocsFixes.CustomCommands { - public class Reply : ConsoleCmdAbstract { - public override string GetDescription () { - return "send a message to the player who last sent you a PM"; - } - - public override string GetHelp () { - return "Usage:\n" + - " reply \n" + - "Send the given message to the user you last received a PM from."; - } - - public override string[] GetCommands () { - return new[] {"reply", "re"}; - } - - private void RunInternal (ClientInfo _sender, List _params) { - if (_params.Count < 1) { - SdtdConsole.Instance.Output ("Usage: reply "); - return; - } - - string message = _params [0]; - - ClientInfo receiver = PrivateMessageConnections.GetLastPMSenderForPlayer (_sender); - if (receiver != null) { - Chat.SendMessage (receiver, _sender, message); - } else { - SdtdConsole.Instance.Output ( - "You have not received a PM so far or sender of last received PM is no longer online."); - } - } - - public override void Execute (List _params, CommandSenderInfo _senderInfo) { - if (_senderInfo.RemoteClientInfo == null) { - Log.Out ("Command \"reply\" can only be used on clients!"); - } else { - RunInternal (_senderInfo.RemoteClientInfo, _params); - } - } - } -} Index: binary-improvements/AllocsCommands/Commands/SayToPlayer.cs =================================================================== --- binary-improvements/AllocsCommands/Commands/SayToPlayer.cs (revision 371) +++ (revision ) @@ -1,44 +1,0 @@ -using System; -using System.Collections.Generic; - -namespace AllocsFixes.CustomCommands { - public class SayToPlayer : ConsoleCmdAbstract { - public override string GetDescription () { - return "send a message to a single player"; - } - - public override string GetHelp () { - return "Usage:\n" + - " pm \n" + - "Send a PM to the player given by the player name or entity id (as given by e.g. \"lpi\")."; - } - - public override string[] GetCommands () { - return new[] {"sayplayer", "pm"}; - } - - private void RunInternal (ClientInfo _sender, List _params) { - if (_params.Count < 2) { - SdtdConsole.Instance.Output ("Usage: sayplayer "); - return; - } - - string message = _params [1]; - - ClientInfo receiver = ConsoleHelper.ParseParamIdOrName (_params [0]); - if (receiver != null) { - Chat.SendMessage (receiver, _sender, message); - } else { - SdtdConsole.Instance.Output ("Playername or entity ID not found."); - } - } - - public override void Execute (List _params, CommandSenderInfo _senderInfo) { - if (_senderInfo.RemoteClientInfo != null) { - RunInternal (_senderInfo.RemoteClientInfo, _params); - } else { - RunInternal (null, _params); - } - } - } -} Index: binary-improvements/AllocsCommands/Commands/ShowInventory.cs =================================================================== --- binary-improvements/AllocsCommands/Commands/ShowInventory.cs (revision 371) +++ binary-improvements/AllocsCommands/Commands/ShowInventory.cs (revision 420) @@ -5,9 +5,9 @@ namespace AllocsFixes.CustomCommands { public class ShowInventory : ConsoleCmdAbstract { - public override string GetDescription () { + protected override string getDescription () { return "list inventory of a given player"; } - public override string GetHelp () { + protected override string getHelp () { return "Usage:\n" + " showinventory [tag]\n" + @@ -20,5 +20,5 @@ } - public override string[] GetCommands () { + protected override string[] getCommands () { return new[] {"showinventory", "si"}; }