f4a87a8629
Fix [add command failing with ambiguous type names + refactor for performance ### Problem [add blight would fail with "No type with that name was found" because multiple types contain "blight" (e.g., Server.Items.Blight, Server.Ethics.Evil.Blight, Server.Items.BlightGrippedLongbow, Server.Items.QuiverOfBlight). The old code only succeeded when exactly one type matched the search regardless of constructability and inheriting Mobi les/Items. ### Solution Exact match takes priority: If a type's name exactly equals the search string (case-insensitive), use it directly. Otherwise, show the AddGump with all partial matches. - [add blight → Creates Blight (exact name match) - [add bligh → Shows gump with Blight, BlightGrippedLongbow, etc. ### Refactoring - CommandEventArgs context: Added GetContext<T>/SetContext<T> to pass resolved type through the command chain without method signature changes - Removed TrySetupTarget duplication: Validation now happens only in ValidateArgs, eliminating redundant code paths - Split type matching: - ExactMatch(string) → Returns Type for exact name match (used by [add) - MatchEmptyCtor(string) → Returns ConstructorInfo[] for gump display (empty-callable constructors only) ### Memory & Performance Improvements | Optimization | Benefit | |-------------------------------|----------------------------------------------------------------------------------------------| | _mobileItemTypes cache | Filters Mobile/Item types once per assembly, reused on all subsequent searches | | ReadOnlySpan<string> for args | Avoids string[] heap allocations when slicing arguments | | ValueStringBuilder | Stack-allocated string building, avoids StringBuilder heap allocation | | Single type resolution | Type resolved once in ValidateArgs, passed via context to Execute (was resolved 2-3x before) |
104 lines
3.4 KiB
C#
104 lines
3.4 KiB
C#
using Server.Targeting;
|
|
|
|
namespace Server.Commands.Generic
|
|
{
|
|
public class SingleCommandImplementor : BaseCommandImplementor
|
|
{
|
|
public SingleCommandImplementor()
|
|
{
|
|
Accessors = new[] { "Single" };
|
|
SupportRequirement = CommandSupport.Single;
|
|
AccessLevel = AccessLevel.Counselor;
|
|
Usage = "Single <command>";
|
|
Description =
|
|
"Invokes the command on a single targeted object. This is the same as just invoking the command directly.";
|
|
}
|
|
|
|
public override void Register(BaseCommand command)
|
|
{
|
|
base.Register(command);
|
|
|
|
for (var i = 0; i < command.Commands.Length; ++i)
|
|
{
|
|
CommandSystem.Register(command.Commands[i], command.AccessLevel, Redirect);
|
|
}
|
|
}
|
|
|
|
public void Redirect(CommandEventArgs e)
|
|
{
|
|
Commands.TryGetValue(e.Command, out var command);
|
|
|
|
if (command == null)
|
|
{
|
|
e.Mobile.SendMessage("That is either an invalid command name or one that does not support this modifier.");
|
|
}
|
|
else if (e.Mobile.AccessLevel < command.AccessLevel)
|
|
{
|
|
e.Mobile.SendMessage("You do not have access to that command.");
|
|
}
|
|
else
|
|
{
|
|
Process(e.Mobile, command, e.Arguments);
|
|
}
|
|
}
|
|
|
|
public override void Process(Mobile from, BaseCommand command, string[] args)
|
|
{
|
|
if (command.ValidateArgs(this, new CommandEventArgs(from, command.Commands[0], GenerateArgString(args), args)))
|
|
{
|
|
from.BeginTarget(
|
|
-1,
|
|
command.ObjectTypes == ObjectTypes.All,
|
|
TargetFlags.None,
|
|
(m, targeted, a) => OnTarget(m, targeted, command, a),
|
|
args
|
|
);
|
|
}
|
|
}
|
|
|
|
public void OnTarget(Mobile from, object targeted, BaseCommand command, string[] args)
|
|
{
|
|
if (!BaseCommand.IsAccessible(from, targeted))
|
|
{
|
|
from.SendLocalizedMessage(500447); // That is not accessible.
|
|
return;
|
|
}
|
|
|
|
switch (command.ObjectTypes)
|
|
{
|
|
case ObjectTypes.Both:
|
|
{
|
|
if (targeted is not Item && targeted is not Mobile)
|
|
{
|
|
from.SendMessage("This command does not work on that.");
|
|
return;
|
|
}
|
|
|
|
break;
|
|
}
|
|
case ObjectTypes.Items:
|
|
{
|
|
if (targeted is not Item)
|
|
{
|
|
from.SendMessage("This command only works on items.");
|
|
return;
|
|
}
|
|
|
|
break;
|
|
}
|
|
case ObjectTypes.Mobiles:
|
|
{
|
|
if (targeted is not Mobile)
|
|
{
|
|
from.SendMessage("This command only works on mobiles.");
|
|
return;
|
|
}
|
|
|
|
break;
|
|
}
|
|
}
|
|
|
|
RunCommand(from, targeted, command, args);
|
|
}
|
|
}
|
|
}
|