Avoid SiraUtil warning by patching correct class, bump to 1.6.3

michael-r-elp · michael-r-elp · commit 0f20a09b3a03 · 2025-06-08T16:20:37.000+02:00
diff --git a/MultiplayerCore/MultiplayerCore.csproj b/MultiplayerCore/MultiplayerCore.csproj
@@ -4,7 +4,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AssemblyName>MultiplayerCore</AssemblyName>
-    <AssemblyVersion>1.6.2</AssemblyVersion>
+    <AssemblyVersion>1.6.3</AssemblyVersion>
     <TargetFramework>net472</TargetFramework>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>portable</DebugType>
diff --git a/MultiplayerCore/NodePoseSyncState/MpNodePoseSyncStateManager.cs b/MultiplayerCore/NodePoseSyncState/MpNodePoseSyncStateManager.cs
@@ -67,8 +67,8 @@ private bool GetFullStateUpdateFrequencyMs(ref long __result)
         }
 
         [AffinityPrefix]
-        [AffinityPatch(typeof(NodePoseSyncStateManager), nameof(NodePoseSyncStateManager.TryCreateLocalState))]
-        private void TryCreateLocalState(NodePoseSyncStateManager __instance)
+        [AffinityPatch(typeof(MultiplayerSyncStateManager<global::NodePoseSyncState, global::NodePoseSyncState.NodePose, PoseSerializable, NodePoseSyncStateNetSerializable, NodePoseSyncStateDeltaNetSerializable>), nameof(NodePoseSyncStateManager.TryCreateLocalState))]
+        private void TryCreateLocalState(MultiplayerSyncStateManager<global::NodePoseSyncState, global::NodePoseSyncState.NodePose, PoseSerializable, NodePoseSyncStateNetSerializable, NodePoseSyncStateDeltaNetSerializable> __instance)
         {
 	        if (ShouldForceUpdate)
 	        {
@@ -79,8 +79,8 @@ private void TryCreateLocalState(NodePoseSyncStateManager __instance)
         }
 
         [AffinityPrefix]
-        [AffinityPatch(typeof(NodePoseSyncStateManager), nameof(NodePoseSyncStateManager.HandlePlayerConnected))]
-        private void HandlePlayerConnected(NodePoseSyncStateManager __instance)
+        [AffinityPatch(typeof(MultiplayerSyncStateManager<global::NodePoseSyncState, global::NodePoseSyncState.NodePose, PoseSerializable, NodePoseSyncStateNetSerializable, NodePoseSyncStateDeltaNetSerializable>), nameof(NodePoseSyncStateManager.HandlePlayerConnected))]
+        private void HandlePlayerConnected(MultiplayerSyncStateManager<global::NodePoseSyncState, global::NodePoseSyncState.NodePose, PoseSerializable, NodePoseSyncStateNetSerializable, NodePoseSyncStateDeltaNetSerializable> __instance)
         {
 	        if (ShouldForceUpdate)
 	        {
diff --git a/MultiplayerCore/ScoreSyncState/MpScoreSyncStateManager.cs b/MultiplayerCore/ScoreSyncState/MpScoreSyncStateManager.cs
@@ -64,8 +64,8 @@ private bool GetFullStateUpdateFrequencyMs(ref long __result)
         }
 
         [AffinityPrefix]
-        [AffinityPatch(typeof(ScoreSyncStateManager), nameof(ScoreSyncStateManager.TryCreateLocalState))]
-        private void TryCreateLocalState(ScoreSyncStateManager __instance)
+        [AffinityPatch(typeof(MultiplayerSyncStateManager<StandardScoreSyncState, StandardScoreSyncState.Score, int, StandardScoreSyncStateNetSerializable, StandardScoreSyncStateDeltaNetSerializable>), nameof(ScoreSyncStateManager.TryCreateLocalState))]
+        private void TryCreateLocalState(MultiplayerSyncStateManager<StandardScoreSyncState, StandardScoreSyncState.Score, int, StandardScoreSyncStateNetSerializable, StandardScoreSyncStateDeltaNetSerializable> __instance)
         {
 	        if (ShouldForceUpdate)
 	        {
@@ -76,8 +76,8 @@ private void TryCreateLocalState(ScoreSyncStateManager __instance)
         }
 
         [AffinityPrefix]
-        [AffinityPatch(typeof(ScoreSyncStateManager), nameof(ScoreSyncStateManager.HandlePlayerConnected))]
-        private void HandlePlayerConnected(ScoreSyncStateManager __instance)
+        [AffinityPatch(typeof(MultiplayerSyncStateManager<StandardScoreSyncState, StandardScoreSyncState.Score, int, StandardScoreSyncStateNetSerializable, StandardScoreSyncStateDeltaNetSerializable>), nameof(ScoreSyncStateManager.HandlePlayerConnected))]
+        private void HandlePlayerConnected(MultiplayerSyncStateManager<StandardScoreSyncState, StandardScoreSyncState.Score, int, StandardScoreSyncStateNetSerializable, StandardScoreSyncStateDeltaNetSerializable> __instance)
         {
 	        if (ShouldForceUpdate)
 	        {
diff --git a/MultiplayerCore/manifest.json b/MultiplayerCore/manifest.json
@@ -3,7 +3,7 @@
   "id": "MultiplayerCore",
   "name": "MultiplayerCore",
   "author": "Goobwabber",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "description": "Adds custom songs to Beat Saber Multiplayer.",
   "gameVersion": "1.40.0",
   "dependsOn": {

Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,8 @@ private bool GetFullStateUpdateFrequencyMs(ref long __result)`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`[AffinityPrefix]`
`70`		`- [AffinityPatch(typeof(NodePoseSyncStateManager), nameof(NodePoseSyncStateManager.TryCreateLocalState))]`
`71`		`- private void TryCreateLocalState(NodePoseSyncStateManager __instance)`
	`70`	`+ [AffinityPatch(typeof(MultiplayerSyncStateManager<global::NodePoseSyncState, global::NodePoseSyncState.NodePose, PoseSerializable, NodePoseSyncStateNetSerializable, NodePoseSyncStateDeltaNetSerializable>), nameof(NodePoseSyncStateManager.TryCreateLocalState))]`
	`71`	`+ private void TryCreateLocalState(MultiplayerSyncStateManager<global::NodePoseSyncState, global::NodePoseSyncState.NodePose, PoseSerializable, NodePoseSyncStateNetSerializable, NodePoseSyncStateDeltaNetSerializable> __instance)`
`72`	`72`	`{`
`73`	`73`	`if (ShouldForceUpdate)`
`74`	`74`	`{`
`@@ -79,8 +79,8 @@ private void TryCreateLocalState(NodePoseSyncStateManager __instance)`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`[AffinityPrefix]`
`82`		`- [AffinityPatch(typeof(NodePoseSyncStateManager), nameof(NodePoseSyncStateManager.HandlePlayerConnected))]`
`83`		`- private void HandlePlayerConnected(NodePoseSyncStateManager __instance)`
	`82`	`+ [AffinityPatch(typeof(MultiplayerSyncStateManager<global::NodePoseSyncState, global::NodePoseSyncState.NodePose, PoseSerializable, NodePoseSyncStateNetSerializable, NodePoseSyncStateDeltaNetSerializable>), nameof(NodePoseSyncStateManager.HandlePlayerConnected))]`
	`83`	`+ private void HandlePlayerConnected(MultiplayerSyncStateManager<global::NodePoseSyncState, global::NodePoseSyncState.NodePose, PoseSerializable, NodePoseSyncStateNetSerializable, NodePoseSyncStateDeltaNetSerializable> __instance)`
`84`	`84`	`{`
`85`	`85`	`if (ShouldForceUpdate)`
`86`	`86`	`{`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@ private bool GetFullStateUpdateFrequencyMs(ref long __result)`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`[AffinityPrefix]`
`67`		`- [AffinityPatch(typeof(ScoreSyncStateManager), nameof(ScoreSyncStateManager.TryCreateLocalState))]`
`68`		`- private void TryCreateLocalState(ScoreSyncStateManager __instance)`
	`67`	`+ [AffinityPatch(typeof(MultiplayerSyncStateManager<StandardScoreSyncState, StandardScoreSyncState.Score, int, StandardScoreSyncStateNetSerializable, StandardScoreSyncStateDeltaNetSerializable>), nameof(ScoreSyncStateManager.TryCreateLocalState))]`
	`68`	`+ private void TryCreateLocalState(MultiplayerSyncStateManager<StandardScoreSyncState, StandardScoreSyncState.Score, int, StandardScoreSyncStateNetSerializable, StandardScoreSyncStateDeltaNetSerializable> __instance)`
`69`	`69`	`{`
`70`	`70`	`if (ShouldForceUpdate)`
`71`	`71`	`{`
`@@ -76,8 +76,8 @@ private void TryCreateLocalState(ScoreSyncStateManager __instance)`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`[AffinityPrefix]`
`79`		`- [AffinityPatch(typeof(ScoreSyncStateManager), nameof(ScoreSyncStateManager.HandlePlayerConnected))]`
`80`		`- private void HandlePlayerConnected(ScoreSyncStateManager __instance)`
	`79`	`+ [AffinityPatch(typeof(MultiplayerSyncStateManager<StandardScoreSyncState, StandardScoreSyncState.Score, int, StandardScoreSyncStateNetSerializable, StandardScoreSyncStateDeltaNetSerializable>), nameof(ScoreSyncStateManager.HandlePlayerConnected))]`
	`80`	`+ private void HandlePlayerConnected(MultiplayerSyncStateManager<StandardScoreSyncState, StandardScoreSyncState.Score, int, StandardScoreSyncStateNetSerializable, StandardScoreSyncStateDeltaNetSerializable> __instance)`
`81`	`81`	`{`
`82`	`82`	`if (ShouldForceUpdate)`
`83`	`83`	`{`