diff --git a/Horse Isle Server/HorseIsleServer/Game/Meta.cs b/Horse Isle Server/HorseIsleServer/Game/Meta.cs index 90ad7b9..6473218 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Meta.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Meta.cs @@ -434,7 +434,7 @@ namespace HISP.Game foreach(InventoryItem item in trade.Trader.Inventory.GetItemList()) { 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; message += Messages.FormatTradeOfferItem(itemInfo.IconId, itemInfo.Name, item.ItemInstances.Count, item.ItemId); } diff --git a/Horse Isle Server/HorseIsleServer/Server/Database.cs b/Horse Isle Server/HorseIsleServer/Server/Database.cs index a33b216..540fc18 100755 --- a/Horse Isle Server/HorseIsleServer/Server/Database.cs +++ b/Horse Isle Server/HorseIsleServer/Server/Database.cs @@ -3587,6 +3587,9 @@ namespace HISP.Server } public static bool IsUserSubscribed(int playerId) { + if (ConfigReader.AllUsersSubbed) + return true; + using (MySqlConnection db = new MySqlConnection(ConnectionString)) { db.Open();