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
|
|
@ -41,6 +41,6 @@ namespace Server.Mobiles
|
|||
|
||||
public override bool CanCacheDisplay => false;
|
||||
|
||||
public override IEntity GetEntity() => (IEntity)ActivatorUtil.CreateInstance(Type, m_Content);
|
||||
public override IEntity GetEntity() => Type.CreateInstance<IEntity>(m_Content);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -97,16 +97,7 @@ namespace Server.Mobiles
|
|||
public int MaxAmount { get; set; }
|
||||
|
||||
// get a new instance of an object (we just bought it)
|
||||
public virtual IEntity GetEntity()
|
||||
{
|
||||
if (Args == null || Args.Length == 0)
|
||||
{
|
||||
return (IEntity)ActivatorUtil.CreateInstance(Type);
|
||||
}
|
||||
|
||||
return (IEntity)ActivatorUtil.CreateInstance(Type, Args);
|
||||
// return (Item)ActivatorUtil.CreateInstance( m_Type );
|
||||
}
|
||||
public virtual IEntity GetEntity() => Type.CreateInstance<IEntity>(Args);
|
||||
|
||||
// Attempt to restock with item, (return true if restock successful)
|
||||
public bool Restock(Item item, int amount) => false;
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@ namespace Server.Mobiles
|
|||
}
|
||||
}
|
||||
|
||||
var g = ActivatorUtil.CreateInstance(buyInfo.GumpType, args) as Gump;
|
||||
var g = buyInfo.GumpType.CreateInstance<Gump>(args);
|
||||
|
||||
m_From.SendGump(g);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue