This commit is contained in:
SilicaAndPina 2021-03-01 00:09:38 +13:00
parent 37c4c679a3
commit 4e333d1387
2 changed files with 4 additions and 1 deletions

View file

@ -434,7 +434,7 @@ namespace HISP.Game
foreach(InventoryItem item in trade.Trader.Inventory.GetItemList()) foreach(InventoryItem item in trade.Trader.Inventory.GetItemList())
{ {
Item.ItemInformation itemInfo = Item.GetItemById(item.ItemId); Item.ItemInformation itemInfo = Item.GetItemById(item.ItemId);
if (itemInfo.Type != "QUEST" && itemInfo.Type != "TEXT" && !(itemInfo.Id == Item.DorothyShoes || itemInfo.Id == Item.Telescope)) if (itemInfo.Type == "QUEST" || itemInfo.Type == "TEXT" || itemInfo.Id == Item.DorothyShoes)
continue; continue;
message += Messages.FormatTradeOfferItem(itemInfo.IconId, itemInfo.Name, item.ItemInstances.Count, item.ItemId); message += Messages.FormatTradeOfferItem(itemInfo.IconId, itemInfo.Name, item.ItemInstances.Count, item.ItemId);
} }

View file

@ -3587,6 +3587,9 @@ namespace HISP.Server
} }
public static bool IsUserSubscribed(int playerId) public static bool IsUserSubscribed(int playerId)
{ {
if (ConfigReader.AllUsersSubbed)
return true;
using (MySqlConnection db = new MySqlConnection(ConnectionString)) using (MySqlConnection db = new MySqlConnection(ConnectionString))
{ {
db.Open(); db.Open();