Skip to content

Commit 8154f01

Browse files
authored
Merge pull request #699 from qsb-dev/dev
1.2.3
2 parents 5d8d977 + fb8c0fe commit 8154f01

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

QSB/QuantumSync/Patches/Server/ServerQuantumMoonPatches.cs

+3-5
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,9 @@ public static bool ChangeQuantumState(QuantumMoon __instance, bool skipInstantVi
6161
return false;
6262
}
6363

64-
if (__instance._stateIndex == 5 && anyPlayerInQM && !playersInQuantumMoon.All(x => x.EntangledObject != null && x.EntangledObject.AttachedObject == __instance))
65-
{
66-
__result = false;
67-
return false;
68-
}
64+
// Base code has a check here, but it's broken and does nothing.
65+
// if (this._stateIndex == 5 && this._isPlayerInside && !this.IsPlayerEntangled())
66+
// QuantumMoon overrides IsPlayerEntangled() to just return _isPlayerInside.
6967

7068
for (var i = 0; i < 10; i++)
7169
{

QSB/Utility/DebugGUI.cs

+2
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,8 @@ private static void DrawGui()
209209
WriteLine(2, $" - Ref. Transform : {(referenceTransform == null ? "NULL" : referenceTransform.name)}", referenceTransform == null ? Color.red : Color.white);
210210
WriteLine(2, $" - Local Position : {player.Body.transform.localPosition}");
211211
WriteLine(2, $" - Position : {player.Body.transform.position}");
212+
213+
WriteLine(2, $" - Entangled Object: {(player.EntangledObject == null ? "NULL" : player.EntangledObject.Name)}");
212214
}
213215
}
214216

QSB/manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"author": "Nebula, John, Alek, & Rai",
55
"name": "Quantum Space Buddies",
66
"uniqueName": "Raicuparta.QuantumSpaceBuddies",
7-
"version": "1.2.2",
7+
"version": "1.2.3",
88
"owmlVersion": "2.14.0",
99
"dependencies": [ "_nebula.MenuFramework", "JohnCorby.VanillaFix" ],
1010
"pathsToPreserve": [ "debugsettings.json" ],

0 commit comments

Comments
 (0)