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

fix: Moves ContextMenu out of core, streamlines code, fixes bugs (#1873)

Browse source 
## Summary
- Removes allocation of a `List<ContextMenuEntry>` every time a context menu is created.
- Moves packet/context menu creation logic out of the core
- Fixes tame entry

## BREAKING CHANGE
> [!Important]
> **Developer Note**
> ```cs
> public virtual void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
> ```
> and similar functions changed to
> ```cs
> public virtual void GetContextMenuEntries(Mobile from, ref PooledRefList<ContextMenuEntry> list)
> ```
This commit is contained in:
Kamron Batman 2024-07-20 21:33:23 -07:00 • committed by GitHub
parent bb24b330e1
commit f58117a877
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
88 changed files with 1206 additions and 1483 deletions
Download patch file Download diff file Expand all files Collapse all files

68
Projects/UOContent/Items/Maps/TreasureMap.cs
View file

@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using ModernUO.Serialization;
using Server.Collections;
using Server.ContextMenus;
using Server.Engines.Harvest;
using Server.Mobiles;
@ -454,22 +455,20 @@ public partial class TreasureMap : MapItem
base.DisplayTo(from);
}
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
public override void GetContextMenuEntries(Mobile from, ref PooledRefList<ContextMenuEntry> list)
{
base.GetContextMenuEntries(from, list);
base.GetContextMenuEntries(from, ref list);
if (!_completed)
{
if (_decoder == null)
{
list.Add(new DecodeMapEntry(this));
list.Add(new DecodeMapEntry());
}
else
{
var digTool = HasDiggingTool(from);
list.Add(new OpenMapEntry(this));
list.Add(new DigEntry(this, digTool));
list.Add(new OpenMapEntry());
list.Add(new DigEntry(HasDiggingTool(from)));
}
}
}
@ -842,65 +841,52 @@ public partial class TreasureMap : MapItem
private class DecodeMapEntry : ContextMenuEntry
{
private readonly TreasureMap m_Map;
public DecodeMapEntry(TreasureMap map) : base(6147, 2) => m_Map = map;
public override void OnClick()
public DecodeMapEntry() : base(6147, 2)
{
if (!m_Map.Deleted)
}
public override void OnClick(Mobile from, IEntity target)
{
if (target is TreasureMap { Deleted: false } map)
{
m_Map.Decode(Owner.From);
map.Decode(from);
}
}
}
private class OpenMapEntry : ContextMenuEntry
{
private readonly TreasureMap m_Map;
public OpenMapEntry(TreasureMap map) : base(6150, 2) => m_Map = map;
public override void OnClick()
public OpenMapEntry() : base(6150, 2)
{
if (!m_Map.Deleted)
}
public override void OnClick(Mobile from, IEntity target)
{
if (target is TreasureMap { Deleted: false } map)
{
m_Map.DisplayTo(Owner.From);
map.DisplayTo(from);
}
}
}
private class DigEntry : ContextMenuEntry
{
private readonly TreasureMap m_Map;
public DigEntry(bool enabled) : base(6148, 2) => Enabled = enabled;
public DigEntry(TreasureMap map, bool enabled) : base(6148, 2)
public override void OnClick(Mobile from, IEntity target)
{
m_Map = map;
if (!enabled)
{
Flags |= CMEFlags.Disabled;
}
}
public override void OnClick()
{
if (m_Map.Deleted)
if (target is not TreasureMap { Deleted: false } map)
{
return;
}
var from = Owner.From;
if (HasDiggingTool(from))
{
m_Map.OnBeginDig(from);
}
else
if (!HasDiggingTool(from))
{
from.SendLocalizedMessage(1114416); // You must have a digging tool to dig for treasure.
return;
}
map.OnBeginDig(from);
}
}
}