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

fix: Fixes PlayerVendor customizations not working due to constructor issues (#1451)

Browse source
This commit is contained in:
mdodkins 2023-08-11 03:24:45 +01:00 • committed by GitHub
parent 8389bfacfe
commit 23c729f31b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Projects/Server/Utilities/ActivatorExtensions.cs
View file

@ -26,6 +26,13 @@ public static class ActivatorExtensions
Type[] args = null
) => type.GetConstructor(predicate, args, out _);
public static ConstructorInfo GetConstructor(
this Type type,
out int paramCount,
Predicate<ConstructorInfo> predicate = null,
Type[] args = null
) => type.GetConstructor(predicate, args, out paramCount);
public static ConstructorInfo GetConstructor(
this Type type,
Predicate<ConstructorInfo> predicate,

5
Projects/UOContent/Commands/Dupe.cs
View file

@ -106,11 +106,10 @@ namespace Server.Commands
pack = from.Backpack;
}
var c = copy.GetType().GetConstructor();
var c = copy.GetType().GetConstructor(out var paramCount);
if (c != null)
{
var paramList = c.GetParameters();
var args = paramList.Length == 0 ? null : new object[paramList.Length];
var args = paramCount == 0 ? null : new object[paramCount];
if (args != null)
{
Array.Fill(args, Type.Missing);

25
Projects/UOContent/Gumps/PlayerVendorGumps.cs
View file

@ -1,8 +1,10 @@
using System;
using System.Reflection;
using Server.HuePickers;
using Server.Items;
using Server.Mobiles;
using Server.Network;
using Server.Utilities;
namespace Server.Gumps
{
@ -751,6 +753,9 @@ namespace Server.Gumps
private class CustomItem
{
private ConstructorInfo _ctor;
private object[] _params;
public CustomItem(int itemID, int loc, bool longText = false) : this(null, itemID, loc, 0, longText)
{
}
@ -785,22 +790,24 @@ namespace Server.Gumps
return null;
}
Item i = null;
if (_ctor == null)
{
_ctor = Type.GetConstructor(out var paramCount);
_params = paramCount == 0 ? null : new object[paramCount];
if (_params != null)
{
Array.Fill(_params, Type.Missing);
}
}
try
{
var ctor = Type.GetConstructor(Array.Empty<Type>());
if (ctor != null)
{
i = ctor.Invoke(null) as Item;
}
return _ctor?.Invoke(_params) as Item;
}
catch
{
// ignored
return null;
}
return i;
}
}