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

fixes [decorate and adds timestamp to world save (#87)

Browse source
This commit is contained in:
Andrew Fryer 2020-02-19 20:37:12 -05:00 • committed by GitHub
parent d7f0227268
commit 717e192cf7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
65 changed files with 261 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Projects/Scripts/Mobiles/Vendors/BeverageBuy.cs
View file

@ -1,5 +1,6 @@
using System;
using Server.Items;
using Server.Utilities;
namespace Server.Mobiles
{
@ -27,6 +28,6 @@ namespace Server.Mobiles
public override bool CanCacheDisplay => false;
public override IEntity GetEntity() => (IEntity)Activator.CreateInstance(Type, m_Content);
public override IEntity GetEntity() => (IEntity)ActivatorUtil.CreateInstance(Type, m_Content);
}
}
}

7
Projects/Scripts/Mobiles/Vendors/GenericBuy.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using Server.Items;
using Server.Utilities;
namespace Server.Mobiles
{
@ -94,10 +95,10 @@ namespace Server.Mobiles
public virtual IEntity GetEntity()
{
if (Args == null || Args.Length == 0)
return (IEntity)Activator.CreateInstance(Type);
return (IEntity)ActivatorUtil.CreateInstance(Type);
return (IEntity)Activator.CreateInstance(Type, Args);
//return (Item)Activator.CreateInstance( m_Type );
return (IEntity)ActivatorUtil.CreateInstance(Type, Args);
//return (Item)ActivatorUtil.CreateInstance( m_Type );
}
//Attempt to restock with item, (return true if restock successful)

3
Projects/Scripts/Mobiles/Vendors/NPC/CustomHairstylist.cs
View file

@ -3,6 +3,7 @@ using System.Collections.Generic;
using Server.Gumps;
using Server.Items;
using Server.Network;
using Server.Utilities;
namespace Server.Mobiles
{
@ -193,7 +194,7 @@ namespace Server.Mobiles
else
args[i] = origArgs[i];
Gump g = Activator.CreateInstance(buyInfo.GumpType, args) as Gump;
Gump g = ActivatorUtil.CreateInstance(buyInfo.GumpType, args) as Gump;
m_From.SendGump(g);
}