From d0bc56bd004d29877aebc11c2d50e9fb18aa627d Mon Sep 17 00:00:00 2001 From: mikejeffers Date: Sun, 4 Apr 2021 21:25:31 -0400 Subject: [PATCH] dont return undefined entitydefaults (as the result of some being disabled in DB) --- src/Perpetuum/Services/ItemShop/ItemShop.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Perpetuum/Services/ItemShop/ItemShop.cs b/src/Perpetuum/Services/ItemShop/ItemShop.cs index a8d0197ab..096b28476 100644 --- a/src/Perpetuum/Services/ItemShop/ItemShop.cs +++ b/src/Perpetuum/Services/ItemShop/ItemShop.cs @@ -40,7 +40,9 @@ private ItemShopEntry GetEntry(int entryID) { const string qryStr = @"SELECT * FROM dbo.itemshop AS its JOIN itemshoplocations sl ON its.presetid = sl.presetid - WHERE sl.locationeid = @eid AND its.id = @id"; + JOIN entitydefaults d on its.targetdefinition = d.definition + WHERE d.enabled=1 AND d.hidden=0 AND + sl.locationeid = @eid AND its.id = @id"; var record = Db.Query().CommandText(qryStr).SetParameter("@eid", Eid).SetParameter("@id", entryID).ExecuteSingleRow(); if (record == null) @@ -54,7 +56,9 @@ private List GetAll() { const string qryStr = @"SELECT * FROM dbo.itemshop AS its JOIN itemshoplocations sl ON its.presetid = sl.presetid - WHERE sl.locationeid = @eid"; + JOIN entitydefaults d on its.targetdefinition = d.definition + WHERE d.enabled=1 AND d.hidden=0 AND + sl.locationeid = @eid"; var records = Db.Query().CommandText(qryStr).SetParameter("@eid", Eid).Execute();