diff --git a/TShockAPI/DB/ItemManager.cs b/TShockAPI/DB/ItemManager.cs index 3222b1ff..ff3180d8 100644 --- a/TShockAPI/DB/ItemManager.cs +++ b/TShockAPI/DB/ItemManager.cs @@ -106,13 +106,20 @@ namespace TShockAPI.DB } } + public bool ItemIsBanned(string name) + { + if (ItemBans.Contains(new ItemBan(name))) + { + return true; + } + return false; + } + public bool ItemIsBanned(string name, TSPlayer ply) { if (ItemBans.Contains( new ItemBan(name) ) ) { ItemBan b = GetItemBanByName(name); - Console.WriteLine("Item ban exists"); - Console.WriteLine( "Can use: {0}",b.HasPermissionToUseItem(ply)); return !b.HasPermissionToUseItem(ply); } return false; diff --git a/UnitTests/RegionManagerTest.cs b/UnitTests/RegionManagerTest.cs index a8620117..d0ca2068 100644 --- a/UnitTests/RegionManagerTest.cs +++ b/UnitTests/RegionManagerTest.cs @@ -37,13 +37,13 @@ namespace UnitTests [TestMethod] public void AddRegion() { - Region r = new Region( new Rectangle(100,100,100,100), "test", true, "test"); - Assert.IsTrue(manager.AddRegion(r.Area.X, r.Area.Y, r.Area.Width, r.Area.Height, r.Name, r.WorldID)); + Region r = new Region( new Rectangle(100,100,100,100), "test", "test", true, "test"); + Assert.IsTrue(manager.AddRegion(r.Area.X, r.Area.Y, r.Area.Width, r.Area.Height, r.Name, r.Owner, r.WorldID)); Assert.AreEqual(1, manager.Regions.Count); Assert.IsNotNull(manager.ZacksGetRegionByName("test")); - Region r2 = new Region(new Rectangle(201, 201, 100, 100), "test2", true, "test"); - manager.AddRegion(r2.Area.X, r2.Area.Y, r2.Area.Width, r2.Area.Height, r2.Name, r2.WorldID); + Region r2 = new Region(new Rectangle(201, 201, 100, 100), "test2", "test2", true, "test"); + manager.AddRegion(r2.Area.X, r2.Area.Y, r2.Area.Width, r2.Area.Height, r2.Name, r2.Owner, r2.WorldID); Assert.AreEqual(2, manager.Regions.Count); Assert.IsNotNull(manager.ZacksGetRegionByName("test2")); }