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

Fixes dupe exception (#258)

Browse source 
- [X] Cleans up ActivatorUtil
- [X] Fixes dupe exception
- [X] Fixes a bug in BasePotion
- [X] Fixes a few possible memory leaks

Bumps release version
This commit is contained in:
Kamron Batman 2020-09-19 15:46:07 -07:00 • committed by GitHub
parent 4d6e584b6c
commit e9c1e4cbba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
66 changed files with 597 additions and 496 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Projects/UOContent/Spells/Base/SpellRegistry.cs
View file

@ -91,7 +91,7 @@ namespace Server.Spells
try
{
spm = ActivatorUtil.CreateInstance(type) as SpecialMove;
spm = type.CreateInstance<SpecialMove>();
}
catch
{
@ -139,9 +139,9 @@ namespace Server.Spells
try
{
return (Spell)ActivatorUtil.CreateInstance(t, m_Params);
return t.CreateInstance<Spell>(m_Params);
}
catch (Exception e)
catch
{
// ignored
}
@ -167,7 +167,7 @@ namespace Server.Spells
try
{
return (Spell)ActivatorUtil.CreateInstance(t, m_Params);
return t.CreateInstance<Spell>(m_Params);
}
catch
{