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

fix(core): Fixes type caching & cleanup (#422)

Browse source 
- [X] Fixes some issues with the type caching
- [X] Changes type check default to ignore case
- [X] Splits out type caching of insensitive and sensitive lists. This means less stuff to iterate through when checking a type against the string.
- [X] Adds an ArrayEnumerator, mostly for reference purposes (copy/paste as needed)
This commit is contained in:
Kamron Batman 2021-01-20 00:10:33 -08:00 • committed by GitHub
parent b921c38879
commit e869c105d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 253 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Commands/Generic/Commands/Commands.cs
View file

@ -523,7 +523,7 @@ namespace Server.Commands.Generic
{
if (e.Length >= 1)
{
var t = AssemblyHandler.FindFirstTypeForName(e.GetString(0));
var t = AssemblyHandler.FindTypeByName(e.GetString(0));
if (t == null)
{

5
Projects/UOContent/Commands/Generic/Extensions/Compilers/DistinctCompiler.cs
View file

@ -188,9 +188,8 @@ namespace Server.Commands.Generic
var active = emitter.Active;
var getHashCode = active.GetMethod("GetHashCode", Type.EmptyTypes);
getHashCode ??= typeof(T).GetMethod("GetHashCode", Type.EmptyTypes);
var getHashCode = active.GetMethod("GetHashCode", Type.EmptyTypes)
?? typeof(T).GetMethod("GetHashCode", Type.EmptyTypes);
if (active != typeof(int))
{

2
Projects/UOContent/Commands/Generic/Implementors/ObjectConditional.cs
View file

@ -103,7 +103,7 @@ namespace Server.Commands.Generic
return Empty;
}
var objectType = AssemblyHandler.FindFirstTypeForName(args[offset], true);
var objectType = AssemblyHandler.FindTypeByName(args[offset]);
if (objectType == null)
{

4
Projects/UOContent/Commands/Object Creation/Add.cs
View file

@ -111,7 +111,7 @@ namespace Server.Commands
}
}
var type = AssemblyHandler.FindFirstTypeForName(name);
var type = AssemblyHandler.FindTypeByName(name);
if (!IsEntity(type))
{
@ -296,7 +296,7 @@ namespace Server.Commands
if (IsType(type))
{
return AssemblyHandler.FindFirstTypeForName(value);
return AssemblyHandler.FindTypeByName(value);
}
if (IsParsable(type))

2
Projects/UOContent/Commands/Object Creation/Categorization.cs
View file

@ -330,7 +330,7 @@ namespace Server.Commands
for (var i = 0; i < split.Length; ++i)
{
var type = AssemblyHandler.FindFirstTypeForName(split[i].Trim());
var type = AssemblyHandler.FindTypeByName(split[i].Trim());
if (type == null)
{

2
Projects/UOContent/Commands/Object Creation/Decorate.cs
View file

@ -1265,7 +1265,7 @@ namespace Server.Commands
var indexOf = line.IndexOfOrdinal(' ');
list.m_Type = AssemblyHandler.FindFirstTypeForName(line.Substring(0, indexOf++), true);
list.m_Type = AssemblyHandler.FindTypeByName(line.Substring(0, indexOf++));
if (list.m_Type == null)
{

2
Projects/UOContent/Commands/Object Creation/DecorateMag.cs
View file

@ -1252,7 +1252,7 @@ namespace Server.Commands
var indexOf = line.IndexOfOrdinal(' ');
list.m_Type = AssemblyHandler.FindFirstTypeForName(line.Substring(0, indexOf++), true);
list.m_Type = AssemblyHandler.FindTypeByName(line.Substring(0, indexOf++));
if (list.m_Type == null)
{

2
Projects/UOContent/Commands/Profiling.cs
View file

@ -320,7 +320,7 @@ namespace Server.Commands
for (var i = 0; i < count; ++i)
{
types.Add(AssemblyHandler.FindFirstTypeForName(bin.ReadString()));
types.Add(AssemblyHandler.FindTypeByFullName(bin.ReadString()));
}
}

2
Projects/UOContent/Commands/Properties.cs
View file

@ -456,7 +456,7 @@ namespace Server.Commands
{
try
{
toSet = AssemblyHandler.FindFirstTypeForName(value);
toSet = AssemblyHandler.FindTypeByName(value);
if (toSet == null)
{