From 967718d234b30d9e813ab81598d6e4f0861c9d44 Mon Sep 17 00:00:00 2001 From: Mister_Nebula <41904486+misternebula@users.noreply.github.com> Date: Sun, 8 Aug 2021 19:53:55 +0100 Subject: [PATCH] change isServer to isHost --- QSB/Events/QSBEvent.cs | 10 +++++----- QSB/GeyserSync/Events/GeyserEvent.cs | 2 +- QSB/OrbSync/OrbManager.cs | 2 +- QSB/QSBCore.cs | 2 +- QSB/QSBNetworkManager.cs | 4 +++- QSB/QuantumSync/QuantumManager.cs | 2 +- QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs | 4 ++-- QSB/ShipSync/Events/FlyShipEvent.cs | 2 +- QSB/ShipSync/ShipManager.cs | 2 +- QSB/WorldSync/QSBWorldSync.cs | 4 ++-- 10 files changed, 18 insertions(+), 16 deletions(-) diff --git a/QSB/Events/QSBEvent.cs b/QSB/Events/QSBEvent.cs index 0383ad49..d441a276 100644 --- a/QSB/Events/QSBEvent.cs +++ b/QSB/Events/QSBEvent.cs @@ -30,8 +30,8 @@ namespace QSB.Events public abstract void SetupListener(); public abstract void CloseListener(); - public virtual void OnReceiveRemote(bool server, T message) { } - public virtual void OnReceiveLocal(bool server, T message) { } + public virtual void OnReceiveRemote(bool isHost, T message) { } + public virtual void OnReceiveLocal(bool isHost, T message) { } public void SendEvent(T message) { @@ -68,7 +68,7 @@ namespace QSB.Events return; } - if (message.OnlySendToServer && !QNetworkServer.active) + if (message.OnlySendToHost && !QSBCore.IsHost) { return; } @@ -82,11 +82,11 @@ namespace QSB.Events if (message.FromId == QSBPlayerManager.LocalPlayerId || QSBPlayerManager.IsBelongingToLocalPlayer(message.FromId)) { - OnReceiveLocal(QNetworkServer.active, message); + OnReceiveLocal(QSBCore.IsHost, message); return; } - OnReceiveRemote(QNetworkServer.active, message); + OnReceiveRemote(QSBCore.IsHost, message); } } } \ No newline at end of file diff --git a/QSB/GeyserSync/Events/GeyserEvent.cs b/QSB/GeyserSync/Events/GeyserEvent.cs index 330e6d8d..13ac1e02 100644 --- a/QSB/GeyserSync/Events/GeyserEvent.cs +++ b/QSB/GeyserSync/Events/GeyserEvent.cs @@ -21,7 +21,7 @@ namespace QSB.GeyserSync.Events State = state }; - public override void OnReceiveRemote(bool server, BoolWorldObjectMessage message) + public override void OnReceiveRemote(bool isHost, BoolWorldObjectMessage message) { if (!QSBCore.WorldObjectsReady) { diff --git a/QSB/OrbSync/OrbManager.cs b/QSB/OrbSync/OrbManager.cs index 61aef15f..2c8b4d97 100644 --- a/QSB/OrbSync/OrbManager.cs +++ b/QSB/OrbSync/OrbManager.cs @@ -22,7 +22,7 @@ namespace QSB.OrbSync { QSBWorldSync.OldOrbList.Clear(); QSBWorldSync.OldOrbList = Resources.FindObjectsOfTypeAll().ToList(); - if (QSBCore.IsServer) + if (QSBCore.IsHost) { NomaiOrbTransformSync.OrbTransformSyncs.ForEach(x => QNetworkServer.Destroy(x.gameObject)); NomaiOrbTransformSync.OrbTransformSyncs.Clear(); diff --git a/QSB/QSBCore.cs b/QSB/QSBCore.cs index 25d47524..d89a2b23 100644 --- a/QSB/QSBCore.cs +++ b/QSB/QSBCore.cs @@ -60,7 +60,7 @@ namespace QSB public static AssetBundle InstrumentAssetBundle { get; private set; } public static AssetBundle ConversationAssetBundle { get; private set; } public static bool WorldObjectsReady => WorldObjectManager.AllReady && IsInMultiplayer && PlayerTransformSync.LocalInstance != null; - public static bool IsServer => QNetworkServer.active; + public static bool IsHost => QNetworkServer.active; public static bool IsInMultiplayer => QNetworkManager.singleton.isNetworkActive; public static string QSBVersion => Helper.Manifest.Version; diff --git a/QSB/QSBNetworkManager.cs b/QSB/QSBNetworkManager.cs index d7420311..473499ce 100644 --- a/QSB/QSBNetworkManager.cs +++ b/QSB/QSBNetworkManager.cs @@ -169,7 +169,7 @@ namespace QSB QSBCore.UnityEvents.RunWhen(() => QSBEventManager.Ready && PlayerTransformSync.LocalInstance != null, () => QSBEventManager.FireEvent(EventNames.QSBPlayerJoin, _lobby.PlayerName)); - if (!QSBCore.IsServer) + if (!QSBCore.IsHost) { QSBCore.UnityEvents.RunWhen(() => QSBEventManager.Ready && PlayerTransformSync.LocalInstance != null, () => QSBEventManager.FireEvent(EventNames.QSBPlayerStatesRequest)); @@ -183,6 +183,8 @@ namespace QSB DebugLog.DebugWrite("OnStopClient", MessageType.Info); DebugLog.ToConsole("Disconnecting from server...", MessageType.Info); Destroy(GetComponent()); + Destroy(GetComponent()); + Destroy(GetComponent()); QSBEventManager.Reset(); QSBPlayerManager.PlayerList.ForEach(player => player.HudMarker?.Remove()); diff --git a/QSB/QuantumSync/QuantumManager.cs b/QSB/QuantumSync/QuantumManager.cs index bde3cf8e..7581cc58 100644 --- a/QSB/QuantumSync/QuantumManager.cs +++ b/QSB/QuantumSync/QuantumManager.cs @@ -47,7 +47,7 @@ namespace QSB.QuantumSync public void PlayerLeave(uint playerId) { - if (!QSBCore.IsServer) + if (!QSBCore.IsHost) { return; } diff --git a/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs b/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs index c46c809b..766bd389 100644 --- a/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs +++ b/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs @@ -87,7 +87,7 @@ namespace QSB.QuantumSync.WorldObjects private void OnEnable(Shape s) { IsEnabled = true; - if (!QSBCore.WorldObjectsReady && !QSBCore.IsServer) + if (!QSBCore.WorldObjectsReady && !QSBCore.IsHost) { return; } @@ -116,7 +116,7 @@ namespace QSB.QuantumSync.WorldObjects } IsEnabled = false; - if (!QSBCore.WorldObjectsReady && !QSBCore.IsServer) + if (!QSBCore.WorldObjectsReady && !QSBCore.IsHost) { return; } diff --git a/QSB/ShipSync/Events/FlyShipEvent.cs b/QSB/ShipSync/Events/FlyShipEvent.cs index d44aa0b0..da877e20 100644 --- a/QSB/ShipSync/Events/FlyShipEvent.cs +++ b/QSB/ShipSync/Events/FlyShipEvent.cs @@ -57,7 +57,7 @@ namespace QSB.ShipSync.Events ? id : uint.MaxValue; - if (QSBCore.IsServer) + if (QSBCore.IsHost) { var newAuthority = ShipManager.Instance.CurrentFlyer == uint.MaxValue ? QNetworkServer.connections.First(x => x.GetPlayerId() == QSBPlayerManager.LocalPlayerId) diff --git a/QSB/ShipSync/ShipManager.cs b/QSB/ShipSync/ShipManager.cs index 26c9e7e4..0eab4e49 100644 --- a/QSB/ShipSync/ShipManager.cs +++ b/QSB/ShipSync/ShipManager.cs @@ -69,7 +69,7 @@ namespace QSB.ShipSync sphereShape.radius = 2.5f; sphereShape.center = new Vector3(0, 0, 1); - if (QSBCore.IsServer) + if (QSBCore.IsHost) { if (ShipTransformSync.LocalInstance != null) { diff --git a/QSB/WorldSync/QSBWorldSync.cs b/QSB/WorldSync/QSBWorldSync.cs index b6d94883..a5d3be6a 100644 --- a/QSB/WorldSync/QSBWorldSync.cs +++ b/QSB/WorldSync/QSBWorldSync.cs @@ -154,7 +154,7 @@ namespace QSB.WorldSync public static void SetDialogueCondition(string name, bool state) { - if (!QSBCore.IsServer) + if (!QSBCore.IsHost) { DebugLog.ToConsole("Warning - Cannot write to condition dict when not server!", MessageType.Warning); return; @@ -165,7 +165,7 @@ namespace QSB.WorldSync public static void AddFactReveal(string id, bool saveGame, bool showNotification) { - if (!QSBCore.IsServer) + if (!QSBCore.IsHost) { DebugLog.ToConsole("Warning - Cannot write to fact list when not server!", MessageType.Warning); return;