From 7cf24052fdac73e593e062d569943d034736e8e0 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Thu, 25 May 2023 21:28:59 -0700 Subject: [PATCH] remove patch that is now in vanillafix --- .../ProbeTool/Patches/ProbeToolPatches.cs | 31 ------------------- 1 file changed, 31 deletions(-) diff --git a/QSB/Tools/ProbeTool/Patches/ProbeToolPatches.cs b/QSB/Tools/ProbeTool/Patches/ProbeToolPatches.cs index fcfc9d82..2ff376cb 100644 --- a/QSB/Tools/ProbeTool/Patches/ProbeToolPatches.cs +++ b/QSB/Tools/ProbeTool/Patches/ProbeToolPatches.cs @@ -11,37 +11,6 @@ internal class ProbeToolPatches : QSBPatch { public override QSBPatchTypes Type => QSBPatchTypes.OnClientConnect; - /* - * This patch is just to avoid error spam when testing probe destruction in SolarSystem - */ - - [HarmonyPrefix] - [HarmonyPatch(typeof(NomaiWarpStreaming), nameof(NomaiWarpStreaming.FixedUpdate))] - public static bool FixedUpdateOverride(NomaiWarpStreaming __instance) - { - if (__instance._warpTransmitter != null) - { - var ableToBeWarped = __instance._warpTransmitter.GetViewAngleToTarget() < __instance._streamingAngle; - var probeAbove = __instance._probe != null && __instance._probe.IsLaunched() && (!__instance._probe.IsAnchored() || __instance._warpTransmitter.IsProbeOnPlatform()); - - var shouldBeLoadingRequiredAssets = ableToBeWarped && (__instance._playerInVolume || (__instance._probeInVolume && probeAbove)); - var shouldBeLoadingGeneralAssets = ableToBeWarped && __instance._warpTransmitter.IsPlayerOnPlatform(); - __instance.UpdatePreloadingState(shouldBeLoadingRequiredAssets, shouldBeLoadingGeneralAssets); - } - - if (__instance._warpReceiver != null) - { - var ableToBeWarped = __instance._warpReceiver.IsReturnWarpEnabled() || __instance._warpReceiver.IsBlackHoleOpen(); - var probeAbove = __instance._probe != null && __instance._probe.IsLaunched() && (!__instance._probe.IsAnchored() || __instance._warpReceiver.IsProbeOnPlatform()); - - var shouldBeLoadingRequiredAssets = ableToBeWarped && (__instance._playerInVolume || (__instance._probeInVolume && probeAbove)); - var shouldBeLoadingGeneralAssets = ableToBeWarped && __instance._playerInVolume; - __instance.UpdatePreloadingState(shouldBeLoadingRequiredAssets, shouldBeLoadingGeneralAssets); - } - - return false; - } - [HarmonyPrefix] [HarmonyPatch(typeof(ProbeCamera), nameof(ProbeCamera.RotateHorizontal))] public static bool RotateHorizontal(ProbeCamera __instance, float degrees)