Fixes dupe exception (#258)

- [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

View file

@ -268,7 +268,7 @@ namespace Server.Engines.Harvest
{
try
{
return ActivatorUtil.CreateInstance(type) as Item;
return type.CreateInstance<Item>();
}
catch
{

View file

@ -387,16 +387,17 @@ namespace Server.Engines.Harvest
if (res == resource && res.Types.Length >= 3)
{
var map = from.Map;
if (map == null)
{
return;
}
try
{
var map = from.Map;
if (map == null)
{
return;
}
if (ActivatorUtil.CreateInstance(res.Types[2], 25) is BaseCreature spawned)
var spawned = res.Types[2].CreateEntityInstance<BaseCreature>(25);
if (spawned != null)
{
var offset = Utility.Random(8) * 2;