Merge pull request #331 from anatawa12/reassign-network-id-later

fix: Network IDs us not assigned for newly created PBs
anatawa12 · Aug 19, 2023 · fefcc61 · fefcc61
2 parents 3cb2c1c + dfefd00
commit fefcc61
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md
@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog].
 
 ### Fixed
 - Unity Editor may freezes when there are circular dependency `#329`
+- Network ID is not assigned for newly created PBs `#331`
 
 ### Security
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog].
 
 ### Fixed
 - Unity Editor may freezes when there are circular dependency `#329`
+- Network ID is not assigned for newly created PBs `#331`
 
 ### Security
 

diff --git a/Editor/PreventRemoveAvatarEditorOnly.cs b/Editor/PreventRemoveAvatarEditorOnly.cs
@@ -4,6 +4,7 @@
 using UnityEngine;
 using VRC.SDKBase;
 using VRC.SDKBase.Editor.BuildPipeline;
+using VRC.SDKBase.Network;
 using Debug = System.Diagnostics.Debug;
 
 namespace Anatawa12.AvatarOptimizer
@@ -54,4 +55,15 @@ public bool OnPreprocessAvatar(GameObject avatarGameObject)
             return true;
         }
     }
+
+    internal class AaoReassignNetworkId : IVRCSDKPreprocessAvatarCallback
+    {
+        public int callbackOrder => 65536;
+
+        public bool OnPreprocessAvatar(GameObject avatarGameObject)
+        {
+            NetworkIDAssignment.ConfigureNetworkIDs(avatarGameObject.GetComponent<VRC_AvatarDescriptor>());
+            return true;
+        }
+    }
 }