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/CannedEvil/ChampionSpawn.cs
View file

@ -4,6 +4,7 @@ using Server.Gumps;
using Server.Items;
using Server.Mobiles;
using Server.Regions;
using Server.Utilities;
namespace Server.Engines.CannedEvil
{
@ -363,7 +364,7 @@ namespace Server.Engines.CannedEvil
{
prot.SendLocalizedMessage(1049368); // You have been rewarded for your dedication to Justice!
if (Activator.CreateInstance(scroll.GetType()) is SpecialScroll scrollDupe)
if (ActivatorUtil.CreateInstance(scroll.GetType()) is SpecialScroll scrollDupe)
{
scrollDupe.Skill = scroll.Skill;
scrollDupe.Value = scroll.Value;
@ -552,7 +553,7 @@ namespace Server.Engines.CannedEvil
try
{
Champion = Activator.CreateInstance(ChampionSpawnInfo.GetInfo(m_Type).Champion) as Mobile;
Champion = ActivatorUtil.CreateInstance(ChampionSpawnInfo.GetInfo(m_Type).Champion) as Mobile;
}
catch
{
@ -689,7 +690,7 @@ namespace Server.Engines.CannedEvil
{
try
{
return Activator.CreateInstance(types[Utility.Random(types.Length)]) as Mobile;
return ActivatorUtil.CreateInstance(types[Utility.Random(types.Length)]) as Mobile;
}
catch
{

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)
{

3
Projects/Scripts/Engines/Doom/GauntletSpawner.cs
View file

@ -3,6 +3,7 @@ using System.Collections.Generic;
using Server.Items;
using Server.Mobiles;
using Server.Regions;
using Server.Utilities;
namespace Server.Engines.Doom
{
@ -298,7 +299,7 @@ namespace Server.Engines.Doom
if (type == null)
return;
object obj = Activator.CreateInstance(type);
object obj = ActivatorUtil.CreateInstance(type);
if (obj is Item item)
{

5
Projects/Scripts/Engines/Factions/Core/GuardList.cs
View file

@ -1,3 +1,4 @@
using Server.Utilities;
using System;
using System.Collections.Generic;
@ -19,7 +20,7 @@ namespace Server.Factions
{
try
{
return Activator.CreateInstance(Definition.Type) as BaseFactionGuard;
return ActivatorUtil.CreateInstance(Definition.Type) as BaseFactionGuard;
}
catch
{
@ -27,4 +28,4 @@ namespace Server.Factions
}
}
}
}
}

3
Projects/Scripts/Engines/Factions/Core/Reflector.cs
View file

@ -1,3 +1,4 @@
using Server.Utilities;
using System;
using System.Collections.Generic;
using System.Reflection;
@ -36,7 +37,7 @@ namespace Server.Factions
{
try
{
return Activator.CreateInstance(type);
return ActivatorUtil.CreateInstance(type);
}
catch
{

5
Projects/Scripts/Engines/Factions/Core/VendorList.cs
View file

@ -1,3 +1,4 @@
using Server.Utilities;
using System;
using System.Collections.Generic;
@ -19,7 +20,7 @@ namespace Server.Factions
{
try
{
return Activator.CreateInstance(Definition.Type, town, faction) as BaseFactionVendor;
return ActivatorUtil.CreateInstance(Definition.Type, town, faction) as BaseFactionVendor;
}
catch
{
@ -27,4 +28,4 @@ namespace Server.Factions
}
}
}
}
}

5
Projects/Scripts/Engines/Factions/Items/Power Faction Items/PowerFactionItem.cs
View file

@ -3,6 +3,7 @@ using System.IO;
using Server.Factions;
using Server.Mobiles;
using Server.Network;
using Server.Utilities;
namespace Server
{
@ -174,7 +175,7 @@ namespace Server
public Type Type{ get; }
public Item Construct() => Activator.CreateInstance(Type) as Item;
public Item Construct() => ActivatorUtil.CreateInstance(Type) as Item;
}
}
}
}

3
Projects/Scripts/Engines/Factions/Items/Traps/BaseFactionTrapDeed.cs
View file

@ -1,6 +1,7 @@
using System;
using Server.Engines.Craft;
using Server.Items;
using Server.Utilities;
namespace Server.Factions
{
@ -50,7 +51,7 @@ namespace Server.Factions
{
try
{
return Activator.CreateInstance(TrapType, m_Faction, from) as BaseFactionTrap;
return ActivatorUtil.CreateInstance(TrapType, m_Faction, from) as BaseFactionTrap;
}
catch
{

7
Projects/Scripts/Engines/Factions/Mobiles/Guards/GuardAI.cs
View file

@ -12,6 +12,7 @@ using Server.Spells.Seventh;
using Server.Spells.Sixth;
using Server.Spells.Third;
using Server.Targeting;
using Server.Utilities;
namespace Server.Factions
{
@ -86,7 +87,7 @@ namespace Server.Factions
if (entry.Chance > Utility.Random(100))
{
releaseTime = DateTime.UtcNow + entry.Hold;
return (Spell)Activator.CreateInstance(entry.Spell, mob, null);
return (Spell)ActivatorUtil.CreateInstance(entry.Spell, mob, null);
}
}
@ -656,7 +657,7 @@ namespace Server.Factions
if (types.Count > 1)
spell = new BlessSpell(m_Guard);
else if (types.Count == 1)
spell = Activator.CreateInstance(types[0], m_Guard, null) as Spell;
spell = ActivatorUtil.CreateInstance(types[0], m_Guard, null) as Spell;
}
else if (types.Count > 0)
{
@ -694,7 +695,7 @@ namespace Server.Factions
if (types.Count > 1)
spell = new CurseSpell(m_Guard);
else if (types.Count == 1)
spell = (Spell)Activator.CreateInstance(types[0], m_Guard, null);
spell = (Spell)ActivatorUtil.CreateInstance(types[0], m_Guard, null);
}
}
}

3
Projects/Scripts/Engines/Harvest/Core/HarvestSystem.cs
View file

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using Server.Items;
using Server.Targeting;
using Server.Utilities;
namespace Server.Engines.Harvest
{
@ -220,7 +221,7 @@ namespace Server.Engines.Harvest
{
try
{
return Activator.CreateInstance(type) as Item;
return ActivatorUtil.CreateInstance(type) as Item;
}
catch
{

3
Projects/Scripts/Engines/Harvest/Mining.cs
View file

@ -2,6 +2,7 @@ using System;
using Server.Items;
using Server.Mobiles;
using Server.Targeting;
using Server.Utilities;
namespace Server.Engines.Harvest
{
@ -258,7 +259,7 @@ namespace Server.Engines.Harvest
if (map == null)
return;
if (Activator.CreateInstance(res.Types[2], 25) is BaseCreature spawned)
if (ActivatorUtil.CreateInstance(res.Types[2], 25) is BaseCreature spawned)
{
int offset = Utility.Random(8) * 2;

3
Projects/Scripts/Engines/MLQuests/MLQuestSystem.cs
View file

@ -9,6 +9,7 @@ using Server.Gumps;
using Server.Items;
using Server.Mobiles;
using Server.Network;
using Server.Utilities;
namespace Server.Engines.MLQuests
{
@ -62,7 +63,7 @@ namespace Server.Engines.MLQuests
try
{
quest = Activator.CreateInstance(type) as MLQuest;
quest = ActivatorUtil.CreateInstance(type) as MLQuest;
}
catch
{

5
Projects/Scripts/Engines/MLQuests/Objectives/DeliverObjective.cs
View file

@ -1,9 +1,10 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using Server.Gumps;
using Server.Items;
using Server.Mobiles;
using Server.Utilities;
namespace Server.Engines.MLQuests.Objectives
{
@ -45,7 +46,7 @@ namespace Server.Engines.MLQuests.Objectives
for (int i = 0; i < Amount; ++i)
{
if (!(Activator.CreateInstance(Delivery) is Item item))
if (!(ActivatorUtil.CreateInstance(Delivery) is Item item))
continue;
delivery.Add(item);

5
Projects/Scripts/Engines/MLQuests/Rewards/ItemReward.cs
View file

@ -1,7 +1,8 @@
using System;
using System;
using System.Collections.Generic;
using Server.Engines.MLQuests.Items;
using Server.Mobiles;
using Server.Utilities;
namespace Server.Engines.MLQuests.Rewards
{
@ -53,7 +54,7 @@ namespace Server.Engines.MLQuests.Rewards
try
{
spawnedItem = Activator.CreateInstance(m_Type) as Item;
spawnedItem = ActivatorUtil.CreateInstance(m_Type) as Item;
}
catch (Exception e)
{

3
Projects/Scripts/Engines/Plants/MiscItems/GreenThorns.cs
View file

@ -2,6 +2,7 @@ using System;
using Server.Mobiles;
using Server.Network;
using Server.Targeting;
using Server.Utilities;
namespace Server.Items
{
@ -280,7 +281,7 @@ namespace Server.Items
if (contains)
{
GreenThornsEffect effect =
(GreenThornsEffect)Activator.CreateInstance(taep.Effect, land.Location, from.Map, from);
(GreenThornsEffect)ActivatorUtil.CreateInstance(taep.Effect, land.Location, from.Map, from);
return effect;
}
}

5
Projects/Scripts/Engines/Plants/PlantResources.cs
View file

@ -1,5 +1,6 @@
using System;
using Server.Items;
using Server.Utilities;
namespace Server.Engines.Plants
{
@ -40,6 +41,6 @@ namespace Server.Engines.Plants
return null;
}
public Item CreateResource() => (Item)Activator.CreateInstance(ResourceType);
public Item CreateResource() => (Item)ActivatorUtil.CreateInstance(ResourceType);
}
}
}

3
Projects/Scripts/Engines/Quests/Core/QuestSerializer.cs
View file

@ -1,3 +1,4 @@
using Server.Utilities;
using System;
namespace Server.Engines.Quests
@ -8,7 +9,7 @@ namespace Server.Engines.Quests
{
try
{
return Activator.CreateInstance(type);
return ActivatorUtil.CreateInstance(type);
}
catch
{

5
Projects/Scripts/Engines/Quests/Core/Regions/QuestOfferRegion.cs
View file

@ -2,6 +2,7 @@ using System;
using System.Xml;
using Server.Mobiles;
using Server.Regions;
using Server.Utilities;
namespace Server.Engines.Quests
{
@ -26,7 +27,7 @@ namespace Server.Engines.Quests
if (m is PlayerMobile player && player.Quest == null && QuestSystem.CanOfferQuest(m, m_Quest))
try
{
QuestSystem qs = (QuestSystem)Activator.CreateInstance(m_Quest, player);
QuestSystem qs = (QuestSystem)ActivatorUtil.CreateInstance(m_Quest, player);
qs.SendOffer();
}
catch (Exception ex)
@ -35,4 +36,4 @@ namespace Server.Engines.Quests
}
}
}
}
}

5
Projects/Scripts/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs
View file

@ -8,6 +8,7 @@ using Server.Mobiles;
using Server.Multis;
using Server.Network;
using Server.Regions;
using Server.Utilities;
namespace Server.Misc
{
@ -152,7 +153,7 @@ namespace Server.Misc
try
{
i = Activator.CreateInstance(
i = ActivatorUtil.CreateInstance(
m_LesserArtifacts[(int)DropEra - 1][Utility.Random(m_LesserArtifacts[(int)DropEra - 1].Length)])
as
Item;
@ -528,7 +529,7 @@ namespace Server.Gumps
try
{
item = (Item)Activator.CreateInstance(t.Type);
item = (Item)ActivatorUtil.CreateInstance(t.Type);
}
catch
{

5
Projects/Scripts/Engines/VeteranRewards/RewardEntry.cs
View file

@ -1,3 +1,4 @@
using Server.Utilities;
using System;
namespace Server.Engines.VeteranRewards
@ -64,7 +65,7 @@ namespace Server.Engines.VeteranRewards
{
try
{
Item item = Activator.CreateInstance(ItemType, Args) as Item;
Item item = ActivatorUtil.CreateInstance(ItemType, Args) as Item;
if (item is IRewardItem rewardItem)
rewardItem.IsRewardItem = true;
@ -79,4 +80,4 @@ namespace Server.Engines.VeteranRewards
return null;
}
}
}
}