From 07ca4e439642e544af6a328564724f59e462d71c Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 22 Jul 2023 01:43:37 -0400 Subject: [PATCH] Revert "Fix stupid broken code but still doesn't work" This reverts commit e4e4e20ff465259b015fdde900ae97e2abbe743c. --- NewHorizons/Patches/GlobalMusicControllerPatches.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/NewHorizons/Patches/GlobalMusicControllerPatches.cs b/NewHorizons/Patches/GlobalMusicControllerPatches.cs index 0f0cf24e..be0c66fb 100644 --- a/NewHorizons/Patches/GlobalMusicControllerPatches.cs +++ b/NewHorizons/Patches/GlobalMusicControllerPatches.cs @@ -6,7 +6,7 @@ using UnityEngine; namespace NewHorizons.Patches; [HarmonyPatch(typeof(GlobalMusicController))] -public static class GlobalMusicControllerPatches +public class GlobalMusicControllerPatches { private static AudioDetector _audioDetector; @@ -29,19 +29,19 @@ public static class GlobalMusicControllerPatches // Find the first part of the boolean assignment .Start() .MatchForward(true, - new CodeMatch(OpCodes.Call, AccessTools.Method(typeof(Locator), nameof(Locator.GetPlayerSectorDetector))), - new CodeMatch(OpCodes.Callvirt, AccessTools.Method(typeof(PlayerSectorDetector), nameof(PlayerSectorDetector.InBrambleDimension))), + new CodeMatch(OpCodes.Call, typeof(Locator), nameof(Locator.GetPlayerSectorDetector)), + new CodeMatch(OpCodes.Callvirt, typeof(PlayerSectorDetector), nameof(PlayerSectorDetector.InBrambleDimension)), new CodeMatch(OpCodes.Brfalse_S) ) // Insert a new check to it pointing to the same label as the others .Insert( - new CodeMatch(OpCodes.Call, AccessTools.Method(typeof(GlobalMusicControllerPatches), nameof(GlobalMusicControllerPatches.IsPlayerInNoAudioVolumes))), + new CodeMatch(OpCodes.Call, typeof(GlobalMusicControllerPatches), nameof(GlobalMusicControllerPatches.IsPlayerInNoAudioVolumes)), new CodeMatch(OpCodes.Brfalse_S, label) ) .InstructionEnumeration(); } - public static bool IsPlayerInNoAudioVolumes() + private static bool IsPlayerInNoAudioVolumes() { if (_audioDetector == null) _audioDetector = Object.FindObjectOfType(); return _audioDetector._activeVolumes.Count == 0;