Final Fix

Author: D1GQ

Reactor/Networking/Attributes/InnerNetObjectAttribute.cs

@@ -16,6 +16,7 @@ namespace Reactor.Networking.Attributes;
 public sealed class InnerNetObjectAttribute : Attribute
 {
     private static readonly HashSet<Assembly> _registeredAssemblies = new();
+    private static readonly HashSet<MethodInfo> _registeredMethods = new();
 
     /// <summary>
     /// Registers all <see cref="InnerNetObject"/>s annotated with <see cref="InnerNetObjectAttribute"/> in the specified <paramref name="assembly"/>.
@@ -49,20 +50,7 @@ public static void Register(Assembly assembly)
 
                     if (prefabMethod != null)
                     {
-                        var prefab = prefabMethod.Invoke(null, null);
-
-                        if (prefab == null)
-                        {
-                            Warning($"Failed to register InnerNetObject, prefab return null.");
-                        }
-                        else if (prefab is InnerNetObject netObj)
-                        {
-                            AddInnerNetObject(netObj);
-                        }
-                        else if (prefab is GameObject gameObj)
-                        {
-                            AddInnerNetObject(gameObj);
-                        }
+                        _registeredMethods.Add(prefabMethod);
                     }
                     else
                     {
@@ -77,6 +65,35 @@ public static void Register(Assembly assembly)
         }
     }
 
+    internal static void LoadRegistered()
+    {
+        if (_registeredMethods.Count > 0) // Increase array length by one because of beginning if check in InnerNetClient.CoHandleSpawn()
+        {
+            var innerNetClient = AmongUsClient.Instance;
+            var list2 = innerNetClient.SpawnableObjects.ToList();
+            list2.Add(new());
+            innerNetClient.SpawnableObjects = list2.ToArray();
+        }
+
+        foreach (var prefabMethod in _registeredMethods)
+        {
+            var prefab = prefabMethod.Invoke(null, null);
+
+            if (prefab == null)
+            {
+                Warning($"Failed to register InnerNetObject, prefab return null.");
+            }
+            else if (prefab is InnerNetObject netObj)
+            {
+                AddInnerNetObject(netObj);
+            }
+            else if (prefab is GameObject gameObj)
+            {
+                AddInnerNetObject(gameObj);
+            }
+        }
+    }
+
     private static void AddInnerNetObject(InnerNetObject prefab)
     {
         var innerNetClient = AmongUsClient.Instance;
@@ -110,12 +127,6 @@ private static void AddInnerNetObject(GameObject prefab)
 
     internal static void Initialize()
     {
-        // Increase array length by one because of beginning if check in InnerNetClient.CoHandleSpawn()
-        var innerNetClient = AmongUsClient.Instance;
-        var list2 = innerNetClient.SpawnableObjects.ToList();
-        list2.Add(new());
-        innerNetClient.SpawnableObjects = list2.ToArray();
-
         IL2CPPChainloader.Instance.PluginLoad += (_, assembly, _) => Register(assembly);
     }
 }

Reactor/ReactorPlugin.cs

@@ -51,6 +51,7 @@ public ReactorPlugin()
         RegisterCustomRpcAttribute.Initialize();
         MessageConverterAttribute.Initialize();
         MethodRpcAttribute.Initialize();
+        InnerNetObjectAttribute.Initialize();
 
         LocalizationManager.Register(new HardCodedLocalizationProvider());
     }
@@ -82,7 +83,7 @@ public override void Load()
     /// <inheritdoc />
     public void LateLoad()
     {
-        InnerNetObjectAttribute.Initialize();
+        InnerNetObjectAttribute.LoadRegistered();
     }
 
     /// <inheritdoc />