properly get all fields

A
Eddio0141 · Nov 10, 2024 · bfe3362 · bfe3362
1 parent 7db4ac0
commit bfe3362
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/UniTAS/Patcher/Implementations/Movie/Parser/MovieParser.cs b/UniTAS/Patcher/Implementations/Movie/Parser/MovieParser.cs
@@ -189,7 +189,7 @@ private void AddUnityTypes()
                 continue;
             }
 
-            var fields = AccessTools.GetDeclaredFields(monoBehaviour);
+            var fields = monoBehaviour.GetFields(AccessTools.all);
             foreach (var field in fields)
             {
                 desc.AddMember(field.Name, new ReadOnlyFieldDescriptor(field, InteropAccessMode.Default));

diff --git a/UniTAS/Patcher/Implementations/Serialization/Serializer.cs b/UniTAS/Patcher/Implementations/Serialization/Serializer.cs
@@ -20,7 +20,7 @@ public IEnumerable<SerializedData> SerializeStaticFields(Type targetClass,
             throw new ArgumentNullException(nameof(targetClass));
         }
 
-        return AccessTools.GetDeclaredFields(targetClass).Where(x => x.IsStatic && !x.IsLiteral)
+        return targetClass.GetFields(AccessTools.all).Where(x => x.IsStatic && !x.IsLiteral)
             .Select(x => SerializeField(targetClass.FullName, x, null, references));
     }
 
@@ -59,7 +59,7 @@ private static SerializedData SerializeField(string className, FieldInfo field,
                 return new(className, field.Name, newReferenceId);
             }
 
-            var fields = AccessTools.GetDeclaredFields(value.GetType()).Where(x => !x.IsStatic && !x.IsLiteral)
+            var fields = value.GetType().GetFields(AccessTools.all).Where(x => !x.IsStatic && !x.IsLiteral)
                 .Select(x => SerializeField(null, x, value, references));
 
             // serialize reference
@@ -68,7 +68,7 @@ private static SerializedData SerializeField(string className, FieldInfo field,
         }
 
         // have to go through fields
-        var fields2 = AccessTools.GetDeclaredFields(value.GetType()).Where(x => !x.IsStatic && !x.IsLiteral)
+        var fields2 = value.GetType().GetFields(AccessTools.all).Where(x => !x.IsStatic && !x.IsLiteral)
             .Select(x => SerializeField(null, x, value, references));
         return new(className, field.Name, fields2);
     }