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

fix: Updates container searches for non-generic types (#1567)

Browse source
This commit is contained in:
Voxpire 2023-11-23 17:29:45 +00:00 • committed by GitHub
parent 331f24cb71
commit 3109f59d4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 248 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Projects/UOContent/Commands/Generic/Implementors/ContainedCommandImplementor.cs
View file

@ -67,12 +67,9 @@ namespace Server.Commands.Generic
var list = new List<object>();
foreach (var item in cont.FindItems())
foreach (var item in cont.EnumerateItems(true, ext.IsValid))
{
if (ext.IsValid(item))
{
list.Add(item);
}
list.Add(item);
}
ext.Filter(list);

2
Projects/UOContent/Engines/ML Quests/Objectives/DeliverObjective.cs
View file

@ -193,7 +193,7 @@ namespace Server.Engines.MLQuests.Objectives
var left = Objective.Amount;
foreach (var item in pack.EnumerateItemsByType<Item>(false, ClaimTypePredicate))
foreach (var item in pack.EnumerateItems(false, ClaimTypePredicate))
{
if (left == 0)
{

2
Projects/UOContent/Items/Containers/SalvageBag.cs
View file

@ -251,7 +251,7 @@ public partial class SalvageBag : Bag
var salvaged = 0;
var notSalvaged = 0;
foreach (var item in EnumerateItemsByType<Item>())
foreach (var item in EnumerateItems())
{
if (item is not IScissorable scissorable)
{

2
Projects/UOContent/Items/Misc/Key.cs
View file

@ -97,7 +97,7 @@ public partial class Key : Item
return false;
}
foreach (var item in cont.EnumerateItems())
foreach (var item in cont.FindItems())
{
if (item is Key key)
{

2
Projects/UOContent/Mobiles/PlayerMobile.cs
View file

@ -2394,7 +2394,7 @@ namespace Server.Mobiles
// This fixes a "bug" where players put blessed items in nested bags and they were dropped on death
if (Core.AOS && Backpack?.Deleted == false)
{
foreach (var item in Backpack.EnumerateItemsByType<Item>(predicate: FindItems_Callback))
foreach (var item in Backpack.EnumerateItems(true, FindItems_Callback))
{
Backpack.AddItem(item);
}