From a51a323b9b29594d785e2233832e679e0df4e99a Mon Sep 17 00:00:00 2001 From: Maverick Motherfucker Date: Sun, 5 Jun 2011 12:16:33 -0700 Subject: [PATCH] oops, forgot this' --- TShockAPI/Commands.cs | 12 ++++-------- TShockAPI/TShock.cs | 6 +----- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index 4896dd74..0b2434c5 100644 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -90,14 +90,10 @@ namespace TShockAPI commands.Add(new Command("tp", "tp", new CommandDelegate(TP))); commands.Add(new Command("tphere", "tp", new CommandDelegate(TPHere))); commands.Add(new Command("spawnmob", "spawnmob", new CommandDelegate(SpawnMob))); - commands.Add(new Command("item", "cheat", new CommandDelegate(Item))); - commands.Add(new Command("give", "cheat", new CommandDelegate(Give))); - commands.Add(new Command("heal", "cheat", new CommandDelegate(Heal))); commands.Add(new Command("butcher", "cheat", new CommandDelegate(Butcher))); commands.Add(new Command("maxspawns", "cfg", new CommandDelegate(MaxSpawns))); commands.Add(new Command("spawnrate", "cfg", new CommandDelegate(SpawnRate))); commands.Add(new Command("time", "cfg", new CommandDelegate(Time))); - commands.Add(new Command("kill", "kill", new CommandDelegate(Kill))); commands.Add(new Command("help", "", new CommandDelegate(Help))); commands.Add(new Command("slap", "pvpfun", new CommandDelegate(Slap))); commands.Add(new Command("off-nosave", "maintenance", new CommandDelegate(OffNoSave))); @@ -110,10 +106,10 @@ namespace TShockAPI //TShock.commandList.Add("playing", new CommandDelegate(Playing)); if (ConfigurationManager.distributationAgent != "terraria-online") { - TShock.admincommandList.Add("kill", new CommandDelegate(Kill)); - TShock.admincommandList.Add("item", new CommandDelegate(Item)); - TShock.admincommandList.Add("give", new CommandDelegate(Give)); - TShock.admincommandList.Add("heal", new CommandDelegate(Heal)); + commands.Add(new Command("kill", "kill", new CommandDelegate(Kill))); + commands.Add(new Command("item", "cheat", new CommandDelegate(Item))); + commands.Add(new Command("give", "cheat", new CommandDelegate(Give))); + commands.Add(new Command("heal", "cheat", new CommandDelegate(Heal))); } } diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index c0d54ada..aea8fdc6 100644 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -20,11 +20,7 @@ namespace TShockAPI public static string VersionCodename = "Facepunch"; public static bool shownVersion = false; - - public static Dictionary admincommandList = new Dictionary(); - - public static Dictionary commandList = new Dictionary(); - + static bool[] BlacklistTiles; public override Version Version