warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Cleans up ConsumeTotal and ClockworkAssembly (#1517)

Browse source
This commit is contained in:
Kamron Batman 2023-09-28 23:01:35 -07:00 • committed by GitHub
parent d77dac9516
commit 0d21459e85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 76 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Projects/Server/Items/Container.cs
View file

@ -1206,11 +1206,14 @@ public partial class Container : Item
for (var i = 0; i < types.Length; ++i)
{
items[i] = FindItemsByType(types[i], recurse);
for (var j = 0; j < items[i].Count; ++j)
var itemList = items[i] = new List<Item>();
foreach (var item in FindItems())
{
totals[i] += items[i][j].Amount;
if (types[i].IsInstanceOfType(item))
{
totals[i] += item.Amount;
itemList.Add(item);
}
}
if (totals[i] < amounts[i])

14
Projects/Server/Items/Item.cs
View file

@ -4187,19 +4187,15 @@ public class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropertyListEnt
}
}
public virtual void Consume()
public virtual void Consume(int amount = 1)
{
Consume(1);
}
public virtual void Consume(int amount)
{
Amount -= amount;
if (Amount <= 0)
if (Amount <= amount)
{
Delete();
return;
}
Amount -= amount;
}
public virtual void ReplaceWith(Item newItem)