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

26
Projects/UOContent/Items/Games/BaseBoard.cs
View file

@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
using ModernUO.Serialization;
using Server.Collections;
using Server.ContextMenus;
using Server.Gumps;
using Server.Multis;
@ -86,16 +86,16 @@ public abstract partial class BaseBoard : Container, ISecurable
return false;
}
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 (ValidateDefault(from, this))
{
list.Add(new DefaultEntry(from, this));
list.Add(new DefaultEntry(from.AccessLevel >= AccessLevel.GameMaster ? -1 : 1));
}
SetSecureLevelEntry.AddTo(from, this, list);
SetSecureLevelEntry.AddTo(from, this, ref list);
}
public static bool ValidateDefault(Mobile from, BaseBoard board) =>
@ -106,23 +106,15 @@ public abstract partial class BaseBoard : Container, ISecurable
public class DefaultEntry : ContextMenuEntry
{
private readonly BaseBoard m_Board;
private readonly Mobile m_From;
public DefaultEntry(Mobile from, BaseBoard board) : base(
6162,
from.AccessLevel >= AccessLevel.GameMaster ? -1 : 1
)
public DefaultEntry(int range) : base(6162, range)
{
m_From = from;
m_Board = board;
}
public override void OnClick()
public override void OnClick(Mobile from, IEntity target)
{
if (ValidateDefault(m_From, m_Board))
if (target is BaseBoard board && ValidateDefault(from, board))
{
m_Board.Reset();
board.Reset();
}
}
}

26
Projects/UOContent/Items/Games/Mahjong/MahjongGame.cs
View file

@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
using ModernUO.Serialization;
using Server.Collections;
using Server.ContextMenus;
using Server.Gumps;
using Server.Multis;
@ -187,18 +187,18 @@ public partial class MahjongGame : Item, ISecurable
}
}
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);
_players.CheckPlayers();
if (from.Alive && IsAccessibleTo(from) && _players.GetInGameMobiles(true, false).Count == 0)
{
list.Add(new ResetGameEntry(this));
list.Add(new ResetGameEntry());
}
SetSecureLevelEntry.AddTo(from, this, list);
SetSecureLevelEntry.AddTo(from, this, ref list);
}
public override void OnDoubleClick(Mobile from)
@ -299,18 +299,16 @@ public partial class MahjongGame : Item, ISecurable
private class ResetGameEntry : ContextMenuEntry
{
private readonly MahjongGame _game;
public ResetGameEntry(MahjongGame game) : base(6162) => _game = game;
public override void OnClick()
public ResetGameEntry() : base(6162)
{
var from = Owner.From;
}
if (from.CheckAlive() && !_game.Deleted && _game.IsAccessibleTo(from) &&
_game.Players.GetInGameMobiles(true, false).Count == 0)
public override void OnClick(Mobile from, IEntity target)
{
if (from.CheckAlive() && target is MahjongGame { Deleted: false } game && game.IsAccessibleTo(from) &&
game.Players.GetInGameMobiles(true, false).Count == 0)
{
_game.ResetGame(from);
game.ResetGame(from);
}
}
}