diff --git a/MultiplayerExtensions/MultiplayerExtensions.csproj b/MultiplayerExtensions/MultiplayerExtensions.csproj index d04f2cf..c69176f 100644 --- a/MultiplayerExtensions/MultiplayerExtensions.csproj +++ b/MultiplayerExtensions/MultiplayerExtensions.csproj @@ -66,10 +66,6 @@ $(BeatSaberDir)\Beat Saber_Data\Managed\LiteNetLib.dll False - - $(BeatSaberDir)\Plugins\MultiplayerCore.dll - False - $(BeatSaberDir)\Beat Saber_Data\Managed\netstandard.dll False @@ -213,6 +209,14 @@ + + + + + + + + diff --git a/MultiplayerExtensions/Patchers/EnvironmentPatcher.cs b/MultiplayerExtensions/Patchers/EnvironmentPatcher.cs index 19d8661..368c4ce 100644 --- a/MultiplayerExtensions/Patchers/EnvironmentPatcher.cs +++ b/MultiplayerExtensions/Patchers/EnvironmentPatcher.cs @@ -4,6 +4,7 @@ using SiraUtil.Logging; using System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using UnityEngine; using UnityEngine.SceneManagement; @@ -159,6 +160,7 @@ private void InstallEnvironment(Context __instance, List normalIn } } + [AffinityPrefix] [AffinityPatch(typeof(GameObjectContext), "InstallInstallers")] private void LoveYouCountersPlus(GameObjectContext __instance) @@ -167,6 +169,7 @@ private void LoveYouCountersPlus(GameObjectContext __instance) { DiContainer container = __instance.GetProperty("Container"); var hud = (CoreGameHUDController)_behavioursToInject.Find(x => x is CoreGameHUDController); + container.Unbind(); container.Bind().FromInstance(hud).AsSingle(); var multihud = __instance.transform.GetComponentInChildren(); multihud.gameObject.SetActive(false); @@ -175,7 +178,7 @@ private void LoveYouCountersPlus(GameObjectContext __instance) } } - [AffinityPostfix] + [AffinityPostfix] [AffinityPatch(typeof(GameObjectContext), "InstallSceneBindings")] private void ActivateEnvironment(GameObjectContext __instance) {