From a2f2ea15005a158e9bff0b05fda2d14be99f5d69 Mon Sep 17 00:00:00 2001 From: Zack Piispanen Date: Sat, 23 Jul 2011 17:03:10 -0400 Subject: [PATCH] whoops pushed in some test stuff that would break commands fixed removeItem ban tho, so its all good --- TShockAPI/Commands.cs | 9 ++------- TShockAPI/DB/ItemManager.cs | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index 5ae8fe76..5ba4201e 100644 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -1193,18 +1193,13 @@ namespace TShockAPI { if (args.Parameters.Count > 0) { - /*String groupname = args.Parameters[0]; + String groupname = args.Parameters[0]; args.Parameters.RemoveAt(0); String permissions = String.Join(",", args.Parameters ); String response = TShock.Groups.addGroup(groupname, permissions); if( response.Length > 0 ) - args.Player.SendMessage(response, Color.Green);*/ - - TShock.Itembans.AddNewBan("Gold Coin"); - Console.WriteLine(String.Join(",", TShock.Itembans.ItemBans)); - TShock.Itembans.RemoveBan("Gold Coin"); - Console.WriteLine(String.Join(",", TShock.Itembans.ItemBans)); + args.Player.SendMessage(response, Color.Green); } else { diff --git a/TShockAPI/DB/ItemManager.cs b/TShockAPI/DB/ItemManager.cs index b59a8881..12ddb646 100644 --- a/TShockAPI/DB/ItemManager.cs +++ b/TShockAPI/DB/ItemManager.cs @@ -100,12 +100,8 @@ namespace TShockAPI.DB public void RemoveBan(string itemname) { - if (ItemIsBanned(itemname)) + if (!ItemIsBanned(itemname)) return; - else - { - ItemBans.Remove(itemname); - } try { using (var com = database.CreateCommand()) @@ -113,12 +109,11 @@ namespace TShockAPI.DB com.CommandText = "Delete FROM 'ItemBans' WHERE ItemName=@itemname;"; com.AddParameter("@itemname", Tools.GetItemByName(itemname)[0].name); com.ExecuteNonQuery(); - + ItemBans.Remove(itemname); } } catch (Exception ex) { - ItemBans.Remove(itemname); Log.Error(ex.ToString()); } }