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/Spells/Base/SpellRegistry.cs
View file

@ -1,3 +1,4 @@
using Server.Utilities;
using System;
using System.Collections.Generic;
@ -83,7 +84,7 @@ namespace Server.Spells
try
{
spm = Activator.CreateInstance(type) as SpecialMove;
spm = ActivatorUtil.CreateInstance(type) as SpecialMove;
}
catch
{
@ -123,7 +124,7 @@ namespace Server.Spells
try
{
return (Spell)Activator.CreateInstance(t, m_Params);
return (Spell)ActivatorUtil.CreateInstance(t, m_Params);
}
catch
{
@ -147,7 +148,7 @@ namespace Server.Spells
try
{
return (Spell)Activator.CreateInstance(t, m_Params);
return (Spell)ActivatorUtil.CreateInstance(t, m_Params);
}
catch
{

3
Projects/Scripts/Spells/Fifth/SummonCreature.cs
View file

@ -1,5 +1,6 @@
using System;
using Server.Mobiles;
using Server.Utilities;
namespace Server.Spells.Fifth
{
@ -63,7 +64,7 @@ namespace Server.Spells.Fifth
if (CheckSequence())
try
{
BaseCreature creature = (BaseCreature)Activator.CreateInstance(m_Types[Utility.Random(m_Types.Length)]);
BaseCreature creature = (BaseCreature)ActivatorUtil.CreateInstance(m_Types[Utility.Random(m_Types.Length)]);
//creature.ControlSlots = 2;

3
Projects/Scripts/Spells/First/CreateFood.cs
View file

@ -1,5 +1,6 @@
using System;
using Server.Items;
using Server.Utilities;
namespace Server.Spells.First
{
@ -75,7 +76,7 @@ namespace Server.Spells.First
try
{
item = (Item)Activator.CreateInstance(Type);
item = (Item)ActivatorUtil.CreateInstance(Type);
}
catch
{

3
Projects/Scripts/Spells/Necromancy/AnimateDeadSpell.cs
View file

@ -5,6 +5,7 @@ using Server.Engines.Quests.Necro;
using Server.Items;
using Server.Mobiles;
using Server.Targeting;
using Server.Utilities;
namespace Server.Spells.Necromancy
{
@ -298,7 +299,7 @@ namespace Server.Spells.Necromancy
try
{
summoned = Activator.CreateInstance(toSummon) as Mobile;
summoned = ActivatorUtil.CreateInstance(toSummon) as Mobile;
}
catch
{

3
Projects/Scripts/Spells/Necromancy/SummonFamiliar.cs
View file

@ -3,6 +3,7 @@ using System.Collections.Generic;
using Server.Gumps;
using Server.Mobiles;
using Server.Network;
using Server.Utilities;
namespace Server.Spells.Necromancy
{
@ -170,7 +171,7 @@ namespace Server.Spells.Necromancy
{
try
{
BaseCreature bc = (BaseCreature)Activator.CreateInstance(entry.Type);
BaseCreature bc = (BaseCreature)ActivatorUtil.CreateInstance(entry.Type);
// TODO: Is this right?
bc.Skills.MagicResist.Base = m_From.Skills.MagicResist.Base;

5
Projects/Scripts/Spells/Spellweaving/ArcaneSummon.cs
View file

@ -1,5 +1,6 @@
using System;
using Server.Mobiles;
using Server.Utilities;
namespace Server.Spells.Spellweaving
{
@ -39,7 +40,7 @@ namespace Server.Spells.Spellweaving
try
{
bc = Activator.CreateInstance<T>();
bc = ActivatorUtil.CreateInstance<T>();
}
catch
{
@ -53,4 +54,4 @@ namespace Server.Spells.Spellweaving
}
}
}
}
}