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

fix: Fixes container not properly consuming in some cases (#2230)

Browse source
This commit is contained in:
Kamron Batman 2025-07-06 10:23:37 -07:00 • committed by GitHub
parent 8997130e57
commit edf16effa0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1212,21 +1212,23 @@ public partial class Container : Item
{ {
var consumed = 0; var consumed = 0;
using var toDelete = PooledRefQueue<Item>.Create(); var toDelete = PooledRefQueue<Item>.Create();
RecurseConsumeUpTo(this, type, amount, recurse, ref consumed, toDelete); RecurseConsumeUpTo(this, type, amount, recurse, ref consumed, ref toDelete);
while (toDelete.Count > 0) while (toDelete.Count > 0)
{ {
toDelete.Dequeue().Delete(); toDelete.Dequeue().Delete();
} }
toDelete.Dispose();
return consumed; return consumed;
} }
private static void RecurseConsumeUpTo( private static void RecurseConsumeUpTo(
Item current, Type type, int amount, bool recurse, ref int consumed, Item current, Type type, int amount, bool recurse, ref int consumed,
PooledRefQueue<Item> toDelete ref PooledRefQueue<Item> toDelete
) )
{ {
if (current == null || current.Items.Count == 0) if (current == null || current.Items.Count == 0)
@ -1260,7 +1262,7 @@ public partial class Container : Item
} }
else if (recurse && item is Container) else if (recurse && item is Container)
{ {
RecurseConsumeUpTo(item, type, amount, true, ref consumed, toDelete); RecurseConsumeUpTo(item, type, amount, true, ref consumed, ref toDelete);
} }
} }
} }