mirror of
https://github.com/sp-tarkov/assembly-tool.git
synced 2025-02-12 14:30:45 -05:00
Fix copy/paste mistake, don't match obfuscated base classes
This commit is contained in:
parent
60fff54ada
commit
a6199ce4a0
@ -129,7 +129,7 @@ public class AutoMatcher(List<RemapModel> mappings, string mappingPath)
|
||||
parms.HasAttribute = target.HasCustomAttributes;
|
||||
parms.IsDerived = target.BaseType != null && target.BaseType.Name != "Object";
|
||||
|
||||
if ((bool)parms.IsDerived)
|
||||
if ((bool)parms.IsDerived && !TypesToMatch.Any(t => target.Name.StartsWith(t)))
|
||||
{
|
||||
parms.MatchBaseClass = target.BaseType?.Name.String;
|
||||
}
|
||||
@ -171,7 +171,7 @@ public class AutoMatcher(List<RemapModel> mappings, string mappingPath)
|
||||
.Except(GetFilteredMethodNamesInType(target));
|
||||
|
||||
methods.IncludeMethods.UnionWith(includeMethods);
|
||||
methods.IncludeMethods.UnionWith(excludeMethods);
|
||||
methods.ExcludeMethods.UnionWith(excludeMethods);
|
||||
|
||||
methods.MethodCount = target.Methods
|
||||
.Count(m => !m.IsConstructor && !m.IsGetter && !m.IsSetter && !m.IsSpecialName);
|
||||
@ -214,7 +214,7 @@ public class AutoMatcher(List<RemapModel> mappings, string mappingPath)
|
||||
.Except(target.Fields.Select(s => s.Name.ToString()));
|
||||
|
||||
fields.IncludeFields.UnionWith(includeFields);
|
||||
fields.IncludeFields.UnionWith(excludeFields);
|
||||
fields.ExcludeFields.UnionWith(excludeFields);
|
||||
|
||||
fields.FieldCount = target.Fields.Count;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user