Merges crash bugs into master (#12)
This commit is contained in:
parent
916d404c51
commit
39dfe86e10
8 changed files with 33 additions and 85 deletions
|
|
@ -572,12 +572,14 @@ namespace Server.Gumps
|
|||
|
||||
if (baseType == typeofObject || baseType?.GetProperty(prop.Name, prop.PropertyType) == null)
|
||||
break;
|
||||
|
||||
|
||||
type = baseType;
|
||||
}
|
||||
|
||||
|
||||
if (type != null && !groups.ContainsKey(type))
|
||||
groups[type] = new List<PropertyInfo>{ prop };
|
||||
else
|
||||
groups[type].Add(prop);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -657,13 +659,13 @@ namespace Server.Gumps
|
|||
return 0;
|
||||
if (x == null)
|
||||
return -1;
|
||||
|
||||
|
||||
return y == null ? 1 : x.Name.CompareTo(x.Name);
|
||||
}
|
||||
}
|
||||
|
||||
private class GroupComparer : IComparer<KeyValuePair<Type, List<PropertyInfo>>>
|
||||
{
|
||||
{
|
||||
private Type m_Start;
|
||||
|
||||
public GroupComparer(Type start)
|
||||
|
|
@ -689,4 +691,4 @@ namespace Server.Gumps
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue