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

16
Projects/UOContent/Engines/Plants/MiscItems/GreenThorns.cs
View file

@ -310,18 +310,12 @@ namespace Server.Items
foreach (var taep in m_Table)
{
var contains = false;
for (var i = 0; !contains && i < taep.Tiles.Length; i += 2)
for (var i = 0; i < taep.Tiles.Length; i += 2)
{
contains = tileID >= taep.Tiles[i] && tileID <= taep.Tiles[i + 1];
}
if (contains)
{
var effect =
(GreenThornsEffect)ActivatorUtil.CreateInstance(taep.Effect, land.Location, from.Map, from);
return effect;
if (tileID >= taep.Tiles[i] && tileID <= taep.Tiles[i + 1])
{
return taep.Effect.CreateInstance<GreenThornsEffect>(land.Location, from.Map, from);
}
}
}

2
Projects/UOContent/Engines/Plants/PlantResources.cs
View file

@ -45,6 +45,6 @@ namespace Server.Engines.Plants
return null;
}
public Item CreateResource() => (Item)ActivatorUtil.CreateInstance(ResourceType);
public Item CreateResource() => ResourceType.CreateInstance<Item>();
}
}