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

7
Projects/Scripts/Engines/Craft/Core/CraftItem.cs
View file

@ -5,6 +5,7 @@ using Server.Commands;
using Server.Factions;
using Server.Items;
using Server.Mobiles;
using Server.Utilities;
namespace Server.Engines.Craft
{
@ -139,7 +140,7 @@ namespace Server.Engines.Craft
try
{
item = Activator.CreateInstance(type) as Item;
item = ActivatorUtil.CreateInstance(type) as Item;
}
catch
{
@ -930,7 +931,7 @@ namespace Server.Engines.Craft
}
else
{
item = Activator.CreateInstance(ItemType) as Item;
item = ActivatorUtil.CreateInstance(ItemType) as Item;
}
if (item != null)
@ -1113,7 +1114,7 @@ namespace Server.Engines.Craft
try
{
cc = Activator.CreateInstance(m_CraftItem.ItemType, m_From, m_CraftItem, m_CraftSystem,
cc = ActivatorUtil.CreateInstance(m_CraftItem.ItemType, m_From, m_CraftItem, m_CraftSystem,
m_TypeRes, m_Tool, quality) as CustomCraft;
}
catch

5
Projects/Scripts/Engines/Craft/Core/Resmelt.cs
View file

@ -2,6 +2,7 @@ using System;
using Server.Ethics;
using Server.Items;
using Server.Targeting;
using Server.Utilities;
namespace Server.Engines.Craft
{
@ -82,7 +83,7 @@ namespace Server.Engines.Craft
return SmeltResult.NoSkill;
Type resourceType = info.ResourceTypes[0];
Item ingot = (Item)Activator.CreateInstance(resourceType);
Item ingot = (Item)ActivatorUtil.CreateInstance(resourceType);
if (item is DragonBardingDeed || item is BaseArmor armor && armor.PlayerConstructed ||
item is BaseWeapon weapon && weapon.PlayerConstructed ||
@ -159,4 +160,4 @@ namespace Server.Engines.Craft
}
}
}
}
}

3
Projects/Scripts/Engines/Craft/DefInscription.cs
View file

@ -2,6 +2,7 @@ using System;
using Server.Engines.BulkOrders;
using Server.Items;
using Server.Spells;
using Server.Utilities;
namespace Server.Engines.Craft
{
@ -49,7 +50,7 @@ namespace Server.Engines.Craft
if (typeItem != null)
{
object o = Activator.CreateInstance(typeItem);
object o = ActivatorUtil.CreateInstance(typeItem);
if (o is SpellScroll scroll)
{