Remove crafting ingredients with item ID of 0 in SHOP_OPEN handler

ethanmoffat · May 31, 2024 · 86e8cb0 · 86e8cb0
1 parent 6582873
commit 86e8cb0
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/EOLib/PacketHandlers/Shop/ShopOpenHandler.cs b/EOLib/PacketHandlers/Shop/ShopOpenHandler.cs
@@ -34,11 +34,16 @@ public override bool HandlePacket(ShopOpenServerPacket packet)
             _shopDataRepository.SessionID = packet.SessionId;
             _shopDataRepository.ShopName = packet.ShopName;
 
-            _shopDataRepository.TradeItems = packet.TradeItems.Select(x => new ShopItem(x.ItemId, x.BuyPrice, x.SellPrice, x.MaxBuyAmount)).ToList<IShopItem>();
+            _shopDataRepository.TradeItems = packet.TradeItems
+                .Where(x => x.ItemId > 0)
+                .Select(x => new ShopItem(x.ItemId, x.BuyPrice, x.SellPrice, x.MaxBuyAmount))
+                .ToList<IShopItem>();
+
             _shopDataRepository.CraftItems = packet.CraftItems
+                .Where(x => x.ItemId > 0)
                 .Select(x => new Domain.Interact.Shop.ShopCraftItem(
                     x.ItemId,
-                    x.Ingredients.Select(ing => new ShopCraftIngredient(ing.Id, ing.Amount)).ToList<IShopCraftIngredient>()))
+                    x.Ingredients.Where(x => x.Id > 0).Select(ing => new ShopCraftIngredient(ing.Id, ing.Amount)).ToList<IShopCraftIngredient>()))
                 .ToList<IShopCraftItem>();
 
             foreach (var notifier in _npcInteractionNotifiers)