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:
parent
4d6e584b6c
commit
e9c1e4cbba
66 changed files with 597 additions and 496 deletions
|
|
@ -69,7 +69,7 @@ namespace Server.Engines.MLQuests
|
|||
|
||||
try
|
||||
{
|
||||
quest = ActivatorUtil.CreateInstance(type) as MLQuest;
|
||||
quest = type.CreateInstance<MLQuest>();
|
||||
}
|
||||
catch
|
||||
{
|
||||
|
|
|
|||
|
|
@ -49,17 +49,17 @@ namespace Server.Engines.MLQuests.Objectives
|
|||
|
||||
for (var i = 0; i < Amount; ++i)
|
||||
{
|
||||
if (!(ActivatorUtil.CreateInstance(Delivery) is Item item))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
var item = Delivery.CreateEntityInstance<Item>();
|
||||
|
||||
delivery.Add(item);
|
||||
|
||||
if (item.Stackable && Amount > 1)
|
||||
if (item != null)
|
||||
{
|
||||
item.Amount = Amount;
|
||||
break;
|
||||
delivery.Add(item);
|
||||
|
||||
if (item.Stackable && Amount > 1)
|
||||
{
|
||||
item.Amount = Amount;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ namespace Server.Engines.MLQuests.Rewards
|
|||
|
||||
try
|
||||
{
|
||||
spawnedItem = ActivatorUtil.CreateInstance(m_Type) as Item;
|
||||
spawnedItem = m_Type.CreateInstance<Item>();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue