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

Switches to Kestrel (#102)

Browse source
This commit is contained in:
Kamron Batman 2020-04-12 20:57:48 -07:00 • committed by GitHub
parent 70fddfebde
commit 2c0d97cd36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
141 changed files with 1040 additions and 1679 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,8 +36,8 @@ namespace Server.Items
public class Container : Item
{
private static QueuePool m_QueuePool = new QueuePool(QueueRef<Container>.Generate, preGenerateCount: 2, maxRefrenceRetention: 5);
private static List<Item> m_FindItemsList = new List<Item>();
private static readonly QueuePool m_QueuePool = new QueuePool(QueueRef<Container>.Generate, preGenerateCount: 2, maxRefrenceRetention: 5);
private static readonly List<Item> m_FindItemsList = new List<Item>();
private ContainerData m_ContainerData;
@ -200,7 +200,7 @@ namespace Server.Items
public virtual bool CheckHold(Mobile m, Item item, bool message, bool checkItems, int plusItems, int plusWeight)
{
if (m?.AccessLevel < AccessLevel.GameMaster)
if (m == null || m.AccessLevel < AccessLevel.GameMaster)
{
if (IsDecoContainer)
{
@ -735,7 +735,7 @@ namespace Server.Items
private class GroupComparer : IComparer<Item>
{
private CheckItemGroup m_Grouper;
private readonly CheckItemGroup m_Grouper;
public GroupComparer(CheckItemGroup grouper) => m_Grouper = grouper;
@ -754,8 +754,8 @@ namespace Server.Items
private struct ItemStackEntry
{
public Item m_StackItem;
public Item m_DropItem;
public readonly Item m_StackItem;
public readonly Item m_DropItem;
public ItemStackEntry(Item stack, Item drop)
{
@ -1536,12 +1536,10 @@ namespace Server.Items
{
var container = queue.Dequeue();
foreach (var item in container.Items)
{
if (item is T typedItem && predicate?.Invoke(typedItem) != false)
items.Add(typedItem);
else if (recurse && item is Container itemContainer)
queue.Enqueue(itemContainer);
}
}
return items;
}
@ -1583,7 +1581,7 @@ namespace Server.Items
public class ContainerData
{
private static Dictionary<int, ContainerData> m_Table;
private static readonly Dictionary<int, ContainerData> m_Table;
static ContainerData()
{