Merge pull request #698 from qsb-dev/dev

1.2.2
qsb-dev · Dec 17, 2024 · 5d8d977 · 5d8d977
2 parents 63066cf + 03ec46e
commit 5d8d977
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/QSB/TimeSync/Patches/TimePatches.cs b/QSB/TimeSync/Patches/TimePatches.cs
@@ -32,11 +32,21 @@ public static void PlayerCameraEffectController_WakeUp(PlayerCameraEffectControl
 
 	[HarmonyPrefix]
 	[HarmonyPatch(typeof(OWTime), nameof(OWTime.Pause))]
-	public static bool StopPausing(OWTime.PauseType pauseType)
-		=> pauseType
-			is OWTime.PauseType.Initializing
+	public static bool StopPausing(ref OWTime.PauseType pauseType)
+	{
+		if (pauseType is OWTime.PauseType.Initializing
 			or OWTime.PauseType.Streaming
-			or OWTime.PauseType.Loading;
+			or OWTime.PauseType.Loading)
+		{
+			return true;
+		}
+		else
+		{
+			// stop NomaiVR from pausing manually grrrrrrrrrrr
+			pauseType = OWTime.PauseType.Menu;
+			return false;
+		}
+	}
 
 	[HarmonyPostfix]
 	[HarmonyPatch(typeof(SubmitActionSkipToNextLoop), nameof(SubmitActionSkipToNextLoop.AdvanceToNewTimeLoop))]

diff --git a/QSB/manifest.json b/QSB/manifest.json
@@ -4,7 +4,7 @@
 	"author": "Nebula, John, Alek, & Rai",
 	"name": "Quantum Space Buddies",
 	"uniqueName": "Raicuparta.QuantumSpaceBuddies",
-	"version": "1.2.1",
+	"version": "1.2.2",
 	"owmlVersion": "2.14.0",
 	"dependencies": [ "_nebula.MenuFramework", "JohnCorby.VanillaFix" ],
 	"pathsToPreserve": [ "debugsettings.json" ],