themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #1432 from mistzzt/fix-itemban

Browse source 
Fix an itemban issue due to localization
This commit is contained in:
Hussein Farran 2017-04-28 10:13:21 -04:00 • committed by GitHub
commit e43e4f1b6b
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/DB/ItemManager.cs
View file

@ -65,7 +65,7 @@ namespace TShockAPI.DB
try try
{ {
database.Query("INSERT INTO ItemBans (ItemName, AllowedGroups) VALUES (@0, @1);", database.Query("INSERT INTO ItemBans (ItemName, AllowedGroups) VALUES (@0, @1);",
TShock.Utils.GetItemByName(itemname)[0].Name, ""); itemname, "");
if (!ItemIsBanned(itemname, null)) if (!ItemIsBanned(itemname, null))
ItemBans.Add(new ItemBan(itemname)); ItemBans.Add(new ItemBan(itemname));
} }
@ -81,7 +81,7 @@ namespace TShockAPI.DB
return; return;
try try
{ {
database.Query("DELETE FROM ItemBans WHERE ItemName=@0;", TShock.Utils.GetItemByName(itemname)[0].Name); database.Query("DELETE FROM ItemBans WHERE ItemName=@0;", itemname);
ItemBans.Remove(new ItemBan(itemname)); ItemBans.Remove(new ItemBan(itemname));
} }
catch (Exception ex) catch (Exception ex)

2
TShockAPI/TSPlayer.cs
View file

@ -879,7 +879,7 @@ namespace TShockAPI
(TShock.Itembans.ItemIsBanned(name, this) || !TShock.Config.AllowAllowedGroupsToSpawnBannedItems)) (TShock.Itembans.ItemIsBanned(name, this) || !TShock.Config.AllowAllowedGroupsToSpawnBannedItems))
return false; return false;
GiveItem(type,name,width,height,stack,prefix); GiveItem(type, name, width, height, stack, prefix);
return true; return true;
} }