fix(content): Fixes duplicate alias type (#588)
This commit is contained in:
parent
4da0adc51d
commit
8306db9e91
2 changed files with 3 additions and 2 deletions
|
|
@ -141,6 +141,7 @@ namespace Server
|
||||||
var fullNameMap = new Dictionary<string, HashSet<int>>();
|
var fullNameMap = new Dictionary<string, HashSet<int>>();
|
||||||
var fullNameMapInsensitive = new Dictionary<string, HashSet<int>>();
|
var fullNameMapInsensitive = new Dictionary<string, HashSet<int>>();
|
||||||
|
|
||||||
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
void addTypeToRefs(int index, string fullTypeName)
|
void addTypeToRefs(int index, string fullTypeName)
|
||||||
{
|
{
|
||||||
var typeName = fullTypeName[(fullTypeName.LastIndexOf('.') + 1)..];
|
var typeName = fullTypeName[(fullTypeName.LastIndexOf('.') + 1)..];
|
||||||
|
|
@ -154,7 +155,7 @@ namespace Server
|
||||||
for (var i = 0; i < Types.Length; i++)
|
for (var i = 0; i < Types.Length; i++)
|
||||||
{
|
{
|
||||||
var current = Types[i];
|
var current = Types[i];
|
||||||
addTypeToRefs(i, Types[i].FullName);
|
addTypeToRefs(i, current.FullName);
|
||||||
if (current.GetCustomAttribute(aliasType, false) is TypeAliasAttribute alias)
|
if (current.GetCustomAttribute(aliasType, false) is TypeAliasAttribute alias)
|
||||||
{
|
{
|
||||||
for (var j = 0; j < alias.Aliases.Length; j++)
|
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)
|
private static void AddToRefs(int index, string key, Dictionary<string, HashSet<int>> map)
|
||||||
{
|
{
|
||||||
if (key == null)
|
if (key == null)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
namespace Server.Mobiles
|
namespace Server.Mobiles
|
||||||
{
|
{
|
||||||
[TypeAlias("Server.Mobiles.Grizzlybear")]
|
|
||||||
public class RagingGrizzlyBear : BaseCreature
|
public class RagingGrizzlyBear : BaseCreature
|
||||||
{
|
{
|
||||||
[Constructible]
|
[Constructible]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue