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

fix(cleanup): Consolidate the duplicate code in Properties, PropsGump, and PropsConfig (#540)

Browse source
This commit is contained in:
Kamron Batman 2021-04-14 22:58:56 -07:00 • committed by GitHub
parent 98ce65083a
commit dd2933a9ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 335 additions and 761 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Projects/UOContent/Engines/Spawners/BaseSpawner.cs
View file

@ -10,6 +10,8 @@ using Server.Mobiles;
using Server.Utilities;
using CPA = Server.CommandPropertyAttribute;
using static Server.Attributes;
namespace Server.Engines.Spawners
{
public abstract class BaseSpawner : Item, ISpawner
@ -529,7 +531,7 @@ namespace Server.Engines.Spawners
return null;
}
var attr = Properties.GetCPA(thisProp);
var attr = GetCPA(thisProp);
if (attr == null || attr.WriteLevel > AccessLevel.Developer || !thisProp.CanWrite || attr.ReadOnly)
{
@ -600,7 +602,7 @@ namespace Server.Engines.Spawners
if (paramargs.Length == 0)
{
entity = type.CreateInstance<IEntity>(
ci => Add.IsConstructible(ci, AccessLevel.Developer)
ci => IsConstructible(ci, AccessLevel.Developer)
);
}
else
@ -611,7 +613,7 @@ namespace Server.Engines.Spawners
{
var ctor = ctors[i];
if (Add.IsConstructible(ctor, AccessLevel.Developer))
if (IsConstructible(ctor, AccessLevel.Developer))
{
var paramList = ctor.GetParameters();

5
Projects/UOContent/Engines/Spawners/EditSpawnCommand.cs
View file

@ -15,10 +15,11 @@
using System;
using System.Collections.Generic;
using Server.Commands;
using Server.Commands.Generic;
using Server.Network;
using static Server.Types;
namespace Server.Engines.Spawners
{
public class EditSpawnCommand : BaseCommand
@ -59,7 +60,7 @@ namespace Server.Engines.Spawners
var type = AssemblyHandler.FindTypeByName(name);
if (!Add.IsEntity(type))
if (!IsEntity(type))
{
LogFailure("No type with that name was found.");
return;

10
Projects/UOContent/Engines/Spawners/SpawnPropsCommand.cs
View file

@ -14,11 +14,12 @@
*************************************************************************/
using System.Collections.Generic;
using Server.Commands;
using Server.Commands.Generic;
using Server.Gumps;
using Server.Targeting;
using static Server.Types;
namespace Server.Engines.Spawners
{
public class SpawnPropsCommand : BaseCommand
@ -53,15 +54,14 @@ namespace Server.Engines.Spawners
private class InternalTarget : Target
{
private List<object> _list;
private readonly List<object> _list;
public InternalTarget(List<object> list) : base(-1, false, TargetFlags.None) =>
_list = list;
public InternalTarget(List<object> list) : base(-1, false, TargetFlags.None) => _list = list;
protected override void OnTarget(Mobile from, object targeted)
{
var type = targeted.GetType();
if (!Add.IsEntity(type))
if (!IsEntity(type))
{
from.SendMessage("No type with that name was found.");
}