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

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

20
Projects/Server.Tests/Tests/Network/Packets/Outgoing/MenuPacketTests.cs
View file

@ -1,4 +1,4 @@
using System.Collections.Generic;
using Server.Collections;
using Server.ContextMenus;
using Server.Menus.ItemLists;
using Server.Menus.Questions;
@ -9,13 +9,13 @@ namespace Server.Tests.Network
{
internal class ContextMenuItem : Item
{
private bool _requiresNewPacket;
private readonly bool _requiresNewPacket;
public ContextMenuItem(Serial serial, bool requiresNewPacket) : base(serial) =>
_requiresNewPacket = requiresNewPacket;
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);
list.Add(new ContextMenuEntry(3000001));
list.Add(new ContextMenuEntry(3000002));
@ -35,12 +35,11 @@ namespace Server.Tests.Network
{
var menu = new ItemListMenu(
"Which item would you choose?",
new[]
{
[
new ItemListEntry("Item 1", 0x01),
new ItemListEntry("Item 2", 0x100),
new ItemListEntry("Item 3", 0x1000, 250)
}
]
);
var expected = new DisplayItemListMenu(menu).Compile();
@ -57,12 +56,11 @@ namespace Server.Tests.Network
{
var menu = new QuestionMenu(
"Which option would you choose?",
new[]
{
[
"Option 1",
"Option 2",
"Option 3"
}
]
);
var expected = new DisplayQuestionMenu(menu).Compile();
@ -84,7 +82,7 @@ namespace Server.Tests.Network
m.DefaultMobileInit();
var item = new ContextMenuItem(World.NewItem, newPacket);
var menu = new ContextMenu(m, item);
var menu = ContextMenuSystem.CreateContextMenu(m, item);
var packet = newHaven && newPacket ? (Packet)new DisplayContextMenu(menu) : new DisplayContextMenuOld(menu);
var expected = packet.Compile();