From 98d31bc707f31b97d0c3198a28deaeb32119bf31 Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Tue, 23 Apr 2024 23:33:29 -0700 Subject: [PATCH] fix: Fixes crafting items with IHasQuality attribute (#1738) --- Projects/UOContent/Engines/Craft/Core/CraftItem.cs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Projects/UOContent/Engines/Craft/Core/CraftItem.cs b/Projects/UOContent/Engines/Craft/Core/CraftItem.cs index 7f1085a8e..73261b4c3 100644 --- a/Projects/UOContent/Engines/Craft/Core/CraftItem.cs +++ b/Projects/UOContent/Engines/Craft/Core/CraftItem.cs @@ -549,7 +549,7 @@ namespace Server.Engines.Craft { amount += item.Amount; } - else if ((hq as BaseBeverage)?.Content == RequiredBeverage) + else if (hq is not BaseBeverage bev || bev.Content == RequiredBeverage) { amount += hq.Quantity; } @@ -561,8 +561,7 @@ namespace Server.Engines.Craft public bool ConsumeRes( Mobile from, Type typeRes, CraftSystem craftSystem, ref int resHue, ref int maxAmount, ConsumeType consumeType, ref TextDefinition message - ) => - ConsumeRes(from, typeRes, craftSystem, ref resHue, ref maxAmount, consumeType, ref message, false); + ) => ConsumeRes(from, typeRes, craftSystem, ref resHue, ref maxAmount, consumeType, ref message, false); public bool ConsumeRes( Mobile from, Type typeRes, CraftSystem craftSystem, ref int resHue, ref int maxAmount, @@ -630,7 +629,7 @@ namespace Server.Engines.Craft } } - types[i] ??= new[] { baseType }; + types[i] ??= [baseType]; amounts[i] = craftRes.Amount; // For stackable items that can be crafted more than one at a time @@ -733,12 +732,7 @@ namespace Server.Engines.Craft { for (var i = 0; i < amounts.Length; i++) { - amounts[i] /= 2; - - if (amounts[i] < 1) - { - amounts[i] = 1; - } + amounts[i] = Math.Max(1, amounts[i] / 2); } }