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

21
Projects/UOContent/Engines/Quests/Core/BaseQuester.cs
View file

@ -1,5 +1,6 @@
using System.Collections.Generic;
using ModernUO.Serialization;
using Server.Collections;
using Server.ContextMenus;
using Server.Items;
using Server.Mobiles;
@ -8,17 +9,15 @@ namespace Server.Engines.Quests;
public class TalkEntry : ContextMenuEntry
{
private readonly BaseQuester _quester;
public TalkEntry(BaseQuester quester) : base(quester.TalkNumber) => _quester = quester;
public override void OnClick()
public TalkEntry(int talkNumber) : base(talkNumber)
{
var from = Owner.From;
}
if (from.CheckAlive() && from is PlayerMobile mobile && _quester.CanTalkTo(mobile))
public override void OnClick(Mobile from, IEntity target)
{
if (from.CheckAlive() && from is PlayerMobile mobile && target is BaseQuester quester && quester.CanTalkTo(mobile))
{
_quester.OnTalk(mobile, true);
quester.OnTalk(mobile, true);
}
}
}
@ -60,13 +59,13 @@ public abstract partial class BaseQuester : BaseVendor
return item;
}
public override void AddCustomContextEntries(Mobile from, List<ContextMenuEntry> list)
public override void AddCustomContextEntries(Mobile from, ref PooledRefList<ContextMenuEntry> list)
{
base.AddCustomContextEntries(from, list);
base.AddCustomContextEntries(from, ref list);
if (from.Alive && from is PlayerMobile mobile && TalkNumber > 0 && CanTalkTo(mobile))
{
list.Add(new TalkEntry(this));
list.Add(new TalkEntry(TalkNumber));
}
}

2
Projects/UOContent/Engines/Quests/Core/QuestCallbackEntry.cs
View file

@ -13,7 +13,7 @@ namespace Server.Engines.Quests
public QuestCallbackEntry(int number, int range, QuestCallback callback) : base(number, range) =>
m_Callback = callback;
public override void OnClick()
public override void OnClick(Mobile from, IEntity target)
{
m_Callback?.Invoke();
}

3
Projects/UOContent/Engines/Quests/Core/QuestSystem.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using Server.Collections;
using Server.ContextMenus;
using Server.Engines.Quests.Ambitious;
using Server.Engines.Quests.Collector;
@ -246,7 +247,7 @@ namespace Server.Engines.Quests
From.SendGump(new QuestOfferGump(this));
}
public virtual void GetContextMenuEntries(List<ContextMenuEntry> list)
public virtual void GetContextMenuEntries(ref PooledRefList<ContextMenuEntry> list)
{
if (Objectives.Count > 0)
{