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

core(fix): Fixes type aliasing, categorizations, and NPE (#444)

Browse source 
- [X] Fixes lookup of type aliases
- [X] Fixes categorization
- [X] Removes rebuild categorizations
- [X] Fixes an NPE with DoHarmful and Combatant

Closes #441
This commit is contained in:
Kamron Batman 2021-02-03 16:14:04 -08:00 • committed by GitHub
parent 24ebdd0f90
commit 5d9ebf062f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 3821 additions and 4881 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Projects/UOContent/Misc/ShrinkTable.cs
View file

@ -19,7 +19,7 @@ namespace Server
public static int Lookup(int body, int defaultValue)
{
m_Table ??= Load();
var index = body < m_Table.Length ? m_Table[body] : -1;
var index = body >= 0 && body < m_Table.Length ? m_Table[body] : -1;
if (index < 0)
{
return defaultValue;
@ -35,10 +35,12 @@ namespace Server
if (!File.Exists(path))
{
Console.WriteLine("No table found!");
return Array.Empty<int>();
}
var table = new List<int>();
var list = new List<(int, int)>();
var length = 0;
using var ip = new StreamReader(path);
string line;
@ -61,10 +63,14 @@ namespace Server
var body = Utility.ToInt32(split[0]);
var item = Utility.ToInt32(split[1]);
if (body >= 0)
if (body < 0)
{
table[body] = item;
continue;
}
list.Add((body, item));
length = Math.Max(body + 1, length);
}
}
catch
@ -73,7 +79,13 @@ namespace Server
}
}
return table.ToArray();
var table = new int[length];
foreach (var (body, item) in list)
{
table[body] = item;
}
return table;
}
}
}