diff --git a/Projects/UOContent/Mobiles/Vendors/BaseVendor.cs b/Projects/UOContent/Mobiles/Vendors/BaseVendor.cs index 009815780..485d56c1d 100644 --- a/Projects/UOContent/Mobiles/Vendors/BaseVendor.cs +++ b/Projects/UOContent/Mobiles/Vendors/BaseVendor.cs @@ -842,17 +842,12 @@ namespace Server.Mobiles public virtual void VendorBuy(Mobile from) { - if (!IsActiveSeller) + if (!IsActiveSeller || !from.CheckAlive()) { return; } - if (!from.CheckAlive()) - { - return; - } - - if (!ContentFeatureFlags.VendorPurchase && from.AccessLevel < AccessLevel.Administrator) + if (!ContentFeatureFlags.VendorPurchase) { from.SendMessage(0x22, "Vendor purchases are temporarily disabled."); return; @@ -1019,17 +1014,12 @@ namespace Server.Mobiles public virtual void VendorSell(Mobile from) { - if (!IsActiveBuyer) + if (!IsActiveBuyer || !from.CheckAlive()) { return; } - if (!from.CheckAlive()) - { - return; - } - - if (!ContentFeatureFlags.VendorSell && from.AccessLevel < AccessLevel.Administrator) + if (!ContentFeatureFlags.VendorSell) { from.SendMessage(0x22, "Vendor sales are temporarily disabled."); return; @@ -1419,12 +1409,12 @@ namespace Server.Mobiles list.Add(new BulkOrderInfoEntry()); } - if (IsActiveSeller) + if (ContentFeatureFlags.VendorPurchase && IsActiveSeller) { list.Add(new VendorBuyEntry(CheckVendorAccess(from))); } - if (IsActiveBuyer) + if (ContentFeatureFlags.VendorSell && IsActiveBuyer) { list.Add(new VendorSellEntry(CheckVendorAccess(from))); }