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

fix(content): Fixes duplicate alias type (#588)

Browse source
This commit is contained in:
Kamron Batman 2021-04-30 00:59:53 -07:00 • committed by GitHub
parent 4da0adc51d
commit 8306db9e91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Projects/Server/AssemblyHandler.cs
View file

@ -141,6 +141,7 @@ namespace Server
var fullNameMap = new Dictionary<string, HashSet<int>>();
var fullNameMapInsensitive = new Dictionary<string, HashSet<int>>();
[MethodImpl(MethodImplOptions.AggressiveInlining)]
void addTypeToRefs(int index, string fullTypeName)
{
var typeName = fullTypeName[(fullTypeName.LastIndexOf('.') + 1)..];
@ -154,7 +155,7 @@ namespace Server
for (var i = 0; i < Types.Length; i++)
{
var current = Types[i];
addTypeToRefs(i, Types[i].FullName);
addTypeToRefs(i, current.FullName);
if (current.GetCustomAttribute(aliasType, false) is TypeAliasAttribute alias)
{
for (var j = 0; j < alias.Aliases.Length; j++)
@ -185,6 +186,7 @@ namespace Server
}
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static void AddToRefs(int index, string key, Dictionary<string, HashSet<int>> map)
{
if (key == null)

1
Projects/UOContent/Mobiles/Monsters/ML/Animal/RagingGrizzlyBear.cs
View file

@ -1,6 +1,5 @@
namespace Server.Mobiles
{
[TypeAlias("Server.Mobiles.Grizzlybear")]
public class RagingGrizzlyBear : BaseCreature
{
[Constructible]