Merge pull request #607 from misternebula/dev

misternebula · web-flow · commit 390a3a0475a3 · 2023-03-09T16:49:51.000Z
0.26.3
diff --git a/QSB/AssetBundles/qsb_network b/QSB/AssetBundles/qsb_network
diff --git a/QSB/EchoesOfTheEye/RaftSync/TransformSync/RaftTransformSync.cs b/QSB/EchoesOfTheEye/RaftSync/TransformSync/RaftTransformSync.cs
@@ -11,10 +11,6 @@ namespace QSB.EchoesOfTheEye.RaftSync.TransformSync;
 public class RaftTransformSync : UnsectoredRigidbodySync, ILinkedNetworkBehaviour
 {
 	private bool ShouldMovePlayer =>
-		(
-			Locator.GetPlayerController().GetGroundBody() == null ||
-			Locator.GetPlayerController().GetGroundBody() == AttachedRigidbody
-		) &&
 		Vector3.Distance(AttachedTransform.position, Locator.GetPlayerBody().GetPosition()) < 10;
 	protected override bool UseInterpolation => !ShouldMovePlayer;
 
diff --git a/QSB/Menus/MenuManager.cs b/QSB/Menus/MenuManager.cs
@@ -438,8 +438,12 @@ private static void SetButtonActive(GameObject button, bool active)
 			return;
 		}
 
+		var titleAnimationController = QSBWorldSync.GetUnityObject<TitleScreenManager>()._gfxController;
+
+		var activeAlpha = titleAnimationController.IsTitleAnimationComplete() ? 1 : 0;
+
 		button.SetActive(active);
-		button.GetComponent<CanvasGroup>().alpha = active ? 1 : 0;
+		button.GetComponent<CanvasGroup>().alpha = active ? activeAlpha : 0;
 	}
 
 	private void InitPauseMenus()
diff --git a/QSB/Messaging/QSBMessageManager.cs b/QSB/Messaging/QSBMessageManager.cs
@@ -52,7 +52,15 @@ private static void OnServerReceive(QSBMessage msg)
 		}
 		else
 		{
-			msg.To.GetNetworkConnection().Send<Wrapper>(msg);
+			var connection = msg.To.GetNetworkConnection();
+
+			if (connection == default)
+			{
+				DebugLog.ToConsole($"Warning - Tried to handle message from disconnected(?) player.", MessageType.Warning);
+				return;
+			}
+
+			connection.Send<Wrapper>(msg);
 		}
 	}
 
diff --git a/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs b/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs
@@ -14,9 +14,9 @@
 namespace QSB.QuantumSync.WorldObjects;
 
 /// <summary>
-/// TODO: just use OnSectorOccupantsUpdated instead of this shape bullshit
-///
 /// TODO: make it part of the ad-hoc owner interface
+///
+/// TODO: make it so only players in the sector (which sector?) are checked for visibility 
 /// </summary>
 internal abstract class QSBQuantumObject<T> : WorldObject<T>, IQSBQuantumObject
 	where T : QuantumObject
diff --git a/QSB/ShipSync/TransformSync/ShipTransformSync.cs b/QSB/ShipSync/TransformSync/ShipTransformSync.cs
@@ -1,3 +1,5 @@
+using QSB.HUD;
+using QSB.Player;
 using QSB.Syncs.Sectored.Rigidbodies;
 using QSB.Utility;
 using UnityEngine;
@@ -124,10 +126,7 @@ private static void SetVelocity(OWRigidbody @this, Vector3 newVelocity)
 
 
 	private bool ShouldMovePlayer =>
-		(
-			Locator.GetPlayerController().GetGroundBody() == null ||
-			Locator.GetPlayerController().GetGroundBody() == AttachedRigidbody
-		) &&
-		Vector3.Distance(AttachedTransform.position, Locator.GetPlayerBody().GetPosition()) < 100;
+		PlayerState.InZeroG()
+		&& Vector3.Distance(AttachedTransform.position, Locator.GetPlayerBody().GetPosition()) < 100;
 	protected override bool UseInterpolation => !ShouldMovePlayer;
 }
diff --git a/QSB/TimeSync/Messages/ServerTimeMessage.cs b/QSB/TimeSync/Messages/ServerTimeMessage.cs
@@ -33,5 +33,5 @@ public override void Deserialize(NetworkReader reader)
 	}
 
 	public override void OnReceiveRemote()
-		=> WakeUpSync.LocalInstance.OnClientReceiveMessage(ServerTime, LoopCount, SecondsRemaining);
+		=> WakeUpSync.LocalInstance?.OnClientReceiveMessage(ServerTime, LoopCount, SecondsRemaining);
 }
diff --git a/QSB/TimeSync/StopMeditation.cs b/QSB/TimeSync/StopMeditation.cs
diff --git a/QSB/TimeSync/WakeUpSync.cs b/QSB/TimeSync/WakeUpSync.cs
@@ -16,11 +16,7 @@
 
 namespace QSB.TimeSync;
 
-/// <summary>
-/// BUG: this runs on remote players = BAD! can we move this off of network player?
-/// </summary>
-[UsedInUnityProject]
-public class WakeUpSync : NetworkBehaviour
+public class WakeUpSync : MonoBehaviour, IAddComponentOnStart
 {
 	public static WakeUpSync LocalInstance { get; private set; }
 
@@ -41,8 +37,6 @@ public enum State { NotLoaded, Loaded, FastForwarding, Pausing }
 	private int _serverLoopCount;
 	private bool _hasWokenUp;
 
-	public override void OnStartLocalPlayer() => LocalInstance = this;
-
 	public void OnDisconnect()
 	{
 		OWTime.SetTimeScale(1f);
@@ -60,11 +54,6 @@ public void OnDisconnect()
 
 	public void Start()
 	{
-		if (!isLocalPlayer)
-		{
-			return;
-		}
-
 		if (QSBSceneManager.IsInUniverse)
 		{
 			Init();
@@ -108,10 +97,12 @@ private void OnSceneLoaded(OWScene oldScene, OWScene newScene, bool isInUniverse
 				_hasWokenUp = true;
 			}
 
+			LocalInstance = this;
 			Init();
 		}
 		else
 		{
+			LocalInstance = null;
 			CurrentState = State.NotLoaded;
 		}
 	}
@@ -120,7 +111,7 @@ private void Init()
 	{
 		new RequestStateResyncMessage().Send();
 		CurrentState = State.Loaded;
-		if (isServer)
+		if (QSBCore.IsHost)
 		{
 			SendServerTime();
 		}
@@ -162,7 +153,7 @@ private void WakeUpOrSleep()
 			return;
 		}
 
-		if (PlayerData.LoadLoopCount() != _serverLoopCount && !isServer)
+		if (PlayerData.LoadLoopCount() != _serverLoopCount && !QSBCore.IsHost)
 		{
 			DebugLog.ToConsole($"Warning - ServerLoopCount is not the same as local loop count! local:{PlayerData.LoadLoopCount()} server:{_serverLoopCount}");
 			return;
@@ -268,11 +259,11 @@ private void WakeUp()
 
 	public void Update()
 	{
-		if (isServer)
+		if (QSBCore.IsHost)
 		{
 			UpdateServer();
 		}
-		else if (isLocalPlayer && !QSBCore.DebugSettings.AvoidTimeSync)
+		else if (NetworkClient.active && QSBSceneManager.IsInUniverse && !QSBCore.DebugSettings.AvoidTimeSync)
 		{
 			UpdateClient();
 		}
diff --git a/QSB/WorldSync/QSBWorldSync.cs b/QSB/WorldSync/QSBWorldSync.cs
@@ -23,7 +23,7 @@ public static class QSBWorldSync
 	public static WorldObjectManager[] Managers;
 
 	private static readonly Dictionary<string, List<IWorldObject>> _managerToBuiltObjects = new();
-	public static readonly Dictionary<string, string> ManagerHashes = new();
+	public static readonly Dictionary<string, (string hash, int count)> ManagerHashes = new();
 
 	/// <summary>
 	/// Set when all WorldObjectManagers have called Init() on all their objects (AKA all the objects are created)
@@ -91,15 +91,16 @@ await manager.Try("building world objects", async () =>
 		foreach (var item in _managerToBuiltObjects)
 		{
 			var worldObjects = item.Value;
-			var hash = worldObjects.Select(x => x.GetType().Name).GetMD5Hash();
-			ManagerHashes[item.Key] = hash;
+			var objects = worldObjects.Select(x => x.GetType().Name);
+			var hash = objects.GetMD5Hash();
+			ManagerHashes[item.Key] = (hash, objects.Count());
 		}
 
 		if (!QSBCore.IsHost)
 		{
 			foreach (var item in ManagerHashes)
 			{
-				new WorldObjectsHashMessage(item.Key, item.Value).Send();
+				new WorldObjectsHashMessage(item.Key, item.Value.hash, item.Value.count).Send();
 			}
 
 			new RequestLinksMessage().Send();
diff --git a/QSB/WorldSync/WorldObjectsHashMessage.cs b/QSB/WorldSync/WorldObjectsHashMessage.cs
@@ -8,21 +8,21 @@ namespace QSB.WorldSync;
 /// <summary>
 /// sends QSBWorldSync.WorldObjectsHash to the server for sanity checking
 /// </summary>
-internal class WorldObjectsHashMessage : QSBMessage<(string managerName, string hash)>
+internal class WorldObjectsHashMessage : QSBMessage<(string managerName, string hash, int count)>
 {
-	public WorldObjectsHashMessage(string managerName, string hash) : base((managerName, hash)) => To = 0;
+	public WorldObjectsHashMessage(string managerName, string hash, int count) : base((managerName, hash, count)) => To = 0;
 
 	public override void OnReceiveRemote()
 	{
 		Delay.RunWhen(() => QSBWorldSync.AllObjectsAdded, () =>
 		{
-			var serverHash = QSBWorldSync.ManagerHashes[Data.managerName];
+			var (hash, count) = QSBWorldSync.ManagerHashes[Data.managerName];
 
-			if (serverHash != Data.hash)
+			if (hash != Data.hash)
 			{
 				// oh fuck oh no oh god
-				DebugLog.ToConsole($"Kicking {From} because their WorldObjects hash for {Data.managerName} is wrong. (server:{serverHash}, client:{Data.hash})", MessageType.Error);
-				new PlayerKickMessage(From, $"WorldObject hash error for {Data.managerName}. (Server:{serverHash}, Client:{Data.hash})").Send();
+				DebugLog.ToConsole($"Kicking {From} because their WorldObjects hash for {Data.managerName} is wrong. (Server:{hash} count:{count}, Client:{Data.hash} count:{Data.count})", MessageType.Error);
+				new PlayerKickMessage(From, $"WorldObject hash error for {Data.managerName}. (Server:{hash} count:{count}, Client:{Data.hash}, count:{Data.count})").Send();
 			}
 		});
 	}
diff --git a/QSB/manifest.json b/QSB/manifest.json
@@ -7,7 +7,7 @@
 		"body": "- Disable *all* other mods. (Can heavily affect performance)\n- Make sure you are not running any other network-intensive applications."
 	},
 	"uniqueName": "Raicuparta.QuantumSpaceBuddies",
-	"version": "0.26.2",
+	"version": "0.26.3",
 	"owmlVersion": "2.9.0",
 	"dependencies": [ "_nebula.MenuFramework", "JohnCorby.VanillaFix" ],
 	"pathsToPreserve": [ "debugsettings.json" ],

Original file line number	Diff line number	Diff line change
`@@ -438,8 +438,12 @@ private static void SetButtonActive(GameObject button, bool active)`
`438`	`438`	`return;`
`439`	`439`	`}`
`440`	`440`
	`441`	`+ var titleAnimationController = QSBWorldSync.GetUnityObject<TitleScreenManager>()._gfxController;`
	`442`	`+`
	`443`	`+ var activeAlpha = titleAnimationController.IsTitleAnimationComplete() ? 1 : 0;`
	`444`	`+`
`441`	`445`	`button.SetActive(active);`
`442`		`- button.GetComponent<CanvasGroup>().alpha = active ? 1 : 0;`
	`446`	`+ button.GetComponent<CanvasGroup>().alpha = active ? activeAlpha : 0;`
`443`	`447`	`}`
`444`	`448`
`445`	`449`	`private void InitPauseMenus()`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,15 @@ private static void OnServerReceive(QSBMessage msg)`
`52`	`52`	`}`
`53`	`53`	`else`
`54`	`54`	`{`
`55`		`- msg.To.GetNetworkConnection().Send<Wrapper>(msg);`
	`55`	`+ var connection = msg.To.GetNetworkConnection();`
	`56`	`+`
	`57`	`+ if (connection == default)`
	`58`	`+ {`
	`59`	`+ DebugLog.ToConsole($"Warning - Tried to handle message from disconnected(?) player.", MessageType.Warning);`
	`60`	`+ return;`
	`61`	`+ }`
	`62`	`+`
	`63`	`+ connection.Send<Wrapper>(msg);`
`56`	`64`	`}`
`57`	`65`	`}`
`58`	`66`
Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,5 @@ public override void Deserialize(NetworkReader reader)`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public override void OnReceiveRemote()`
`36`		`- => WakeUpSync.LocalInstance.OnClientReceiveMessage(ServerTime, LoopCount, SecondsRemaining);`
	`36`	`+ => WakeUpSync.LocalInstance?.OnClientReceiveMessage(ServerTime, LoopCount, SecondsRemaining);`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,7 @@`
`16`	`16`
`17`	`17`	`namespace QSB.TimeSync;`
`18`	`18`
`19`		`-/// <summary>`
`20`		`-/// BUG: this runs on remote players = BAD! can we move this off of network player?`
`21`		`-/// </summary>`
`22`		`-[UsedInUnityProject]`
`23`		`-public class WakeUpSync : NetworkBehaviour`
	`19`	`+public class WakeUpSync : MonoBehaviour, IAddComponentOnStart`
`24`	`20`	`{`
`25`	`21`	`public static WakeUpSync LocalInstance { get; private set; }`
`26`	`22`
`@@ -41,8 +37,6 @@ public enum State { NotLoaded, Loaded, FastForwarding, Pausing }`
`41`	`37`	`private int _serverLoopCount;`
`42`	`38`	`private bool _hasWokenUp;`
`43`	`39`
`44`		`- public override void OnStartLocalPlayer() => LocalInstance = this;`
`45`		`-`
`46`	`40`	`public void OnDisconnect()`
`47`	`41`	`{`
`48`	`42`	`OWTime.SetTimeScale(1f);`
`@@ -60,11 +54,6 @@ public void OnDisconnect()`
`60`	`54`
`61`	`55`	`public void Start()`
`62`	`56`	`{`
`63`		`- if (!isLocalPlayer)`
`64`		`- {`
`65`		`- return;`
`66`		`- }`
`67`		`-`
`68`	`57`	`if (QSBSceneManager.IsInUniverse)`
`69`	`58`	`{`
`70`	`59`	`Init();`
`@@ -108,10 +97,12 @@ private void OnSceneLoaded(OWScene oldScene, OWScene newScene, bool isInUniverse`
`108`	`97`	`_hasWokenUp = true;`
`109`	`98`	`}`
`110`	`99`
	`100`	`+ LocalInstance = this;`
`111`	`101`	`Init();`
`112`	`102`	`}`
`113`	`103`	`else`
`114`	`104`	`{`
	`105`	`+ LocalInstance = null;`
`115`	`106`	`CurrentState = State.NotLoaded;`
`116`	`107`	`}`
`117`	`108`	`}`
`@@ -120,7 +111,7 @@ private void Init()`
`120`	`111`	`{`
`121`	`112`	`new RequestStateResyncMessage().Send();`
`122`	`113`	`CurrentState = State.Loaded;`
`123`		`- if (isServer)`
	`114`	`+ if (QSBCore.IsHost)`
`124`	`115`	`{`
`125`	`116`	`SendServerTime();`
`126`	`117`	`}`
`@@ -162,7 +153,7 @@ private void WakeUpOrSleep()`
`162`	`153`	`return;`
`163`	`154`	`}`
`164`	`155`
`165`		`- if (PlayerData.LoadLoopCount() != _serverLoopCount && !isServer)`
	`156`	`+ if (PlayerData.LoadLoopCount() != _serverLoopCount && !QSBCore.IsHost)`
`166`	`157`	`{`
`167`	`158`	`DebugLog.ToConsole($"Warning - ServerLoopCount is not the same as local loop count! local:{PlayerData.LoadLoopCount()} server:{_serverLoopCount}");`
`168`	`159`	`return;`
`@@ -268,11 +259,11 @@ private void WakeUp()`
`268`	`259`
`269`	`260`	`public void Update()`
`270`	`261`	`{`
`271`		`- if (isServer)`
	`262`	`+ if (QSBCore.IsHost)`
`272`	`263`	`{`
`273`	`264`	`UpdateServer();`
`274`	`265`	`}`
`275`		`- else if (isLocalPlayer && !QSBCore.DebugSettings.AvoidTimeSync)`
	`266`	`+ else if (NetworkClient.active && QSBSceneManager.IsInUniverse && !QSBCore.DebugSettings.AvoidTimeSync)`
`276`	`267`	`{`
`277`	`268`	`UpdateClient();`
`278`	`269`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public static class QSBWorldSync`
`23`	`23`	`public static WorldObjectManager[] Managers;`
`24`	`24`
`25`	`25`	`private static readonly Dictionary<string, List<IWorldObject>> _managerToBuiltObjects = new();`
`26`		`- public static readonly Dictionary<string, string> ManagerHashes = new();`
	`26`	`+ public static readonly Dictionary<string, (string hash, int count)> ManagerHashes = new();`
`27`	`27`
`28`	`28`	`/// <summary>`
`29`	`29`	`/// Set when all WorldObjectManagers have called Init() on all their objects (AKA all the objects are created)`
`@@ -91,15 +91,16 @@ await manager.Try("building world objects", async () =>`
`91`	`91`	`foreach (var item in _managerToBuiltObjects)`
`92`	`92`	`{`
`93`	`93`	`var worldObjects = item.Value;`
`94`		`- var hash = worldObjects.Select(x => x.GetType().Name).GetMD5Hash();`
`95`		`- ManagerHashes[item.Key] = hash;`
	`94`	`+ var objects = worldObjects.Select(x => x.GetType().Name);`
	`95`	`+ var hash = objects.GetMD5Hash();`
	`96`	`+ ManagerHashes[item.Key] = (hash, objects.Count());`
`96`	`97`	`}`
`97`	`98`
`98`	`99`	`if (!QSBCore.IsHost)`
`99`	`100`	`{`
`100`	`101`	`foreach (var item in ManagerHashes)`
`101`	`102`	`{`
`102`		`- new WorldObjectsHashMessage(item.Key, item.Value).Send();`
	`103`	`+ new WorldObjectsHashMessage(item.Key, item.Value.hash, item.Value.count).Send();`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`new RequestLinksMessage().Send();`