Merge pull request #699 from qsb-dev/dev

1.2.3
qsb-dev · Dec 23, 2024 · 8154f01 · 8154f01
2 parents 5d8d977 + fb8c0fe
commit 8154f01
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/QSB/QuantumSync/Patches/Server/ServerQuantumMoonPatches.cs b/QSB/QuantumSync/Patches/Server/ServerQuantumMoonPatches.cs
@@ -61,11 +61,9 @@ public static bool ChangeQuantumState(QuantumMoon __instance, bool skipInstantVi
 			return false;
 		}
 
-		if (__instance._stateIndex == 5 && anyPlayerInQM && !playersInQuantumMoon.All(x => x.EntangledObject != null && x.EntangledObject.AttachedObject == __instance))
-		{
-			__result = false;
-			return false;
-		}
+		// Base code has a check here, but it's broken and does nothing.
+		// if (this._stateIndex == 5 && this._isPlayerInside && !this.IsPlayerEntangled())
+		// QuantumMoon overrides IsPlayerEntangled() to just return _isPlayerInside.
 
 		for (var i = 0; i < 10; i++)
 		{

diff --git a/QSB/Utility/DebugGUI.cs b/QSB/Utility/DebugGUI.cs
@@ -209,6 +209,8 @@ private static void DrawGui()
 				WriteLine(2, $" - Ref. Transform : {(referenceTransform == null ? "NULL" : referenceTransform.name)}", referenceTransform == null ? Color.red : Color.white);
 				WriteLine(2, $"   - Local Position : {player.Body.transform.localPosition}");
 				WriteLine(2, $"   - Position : {player.Body.transform.position}");
+
+				WriteLine(2, $" - Entangled Object: {(player.EntangledObject == null ? "NULL" : player.EntangledObject.Name)}");
 			}
 		}
 

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.2",
+	"version": "1.2.3",
 	"owmlVersion": "2.14.0",
 	"dependencies": [ "_nebula.MenuFramework", "JohnCorby.VanillaFix" ],
 	"pathsToPreserve": [ "debugsettings.json" ],