From 65e05835cd55ba2f980ffd51e5cbcf2308a43014 Mon Sep 17 00:00:00 2001 From: Mister_Nebula <41904486+misternebula@users.noreply.github.com> Date: Thu, 13 Aug 2020 17:44:27 +0100 Subject: [PATCH] fixed remote call --- QSB/ElevatorSync/ElevatorEvent.cs | 2 +- QSB/Events/PlayerDeathEvent.cs | 5 +++++ QSB/Events/PlayerLeaveEvent.cs | 5 +++++ QSB/Events/PlayerSectorEvent.cs | 5 +++++ QSB/Events/QSBEvent.cs | 2 -- QSB/GeyserSync/GeyserEvent.cs | 2 +- 6 files changed, 17 insertions(+), 4 deletions(-) diff --git a/QSB/ElevatorSync/ElevatorEvent.cs b/QSB/ElevatorSync/ElevatorEvent.cs index 67c33b84..6f93d971 100644 --- a/QSB/ElevatorSync/ElevatorEvent.cs +++ b/QSB/ElevatorSync/ElevatorEvent.cs @@ -21,7 +21,7 @@ namespace QSB.ElevatorSync public override void OnReceiveRemote(ElevatorMessage message) { - if (!IsInUniverse || message.SenderId == PlayerRegistry.LocalPlayer.NetId) + if (!IsInUniverse) { return; } diff --git a/QSB/Events/PlayerDeathEvent.cs b/QSB/Events/PlayerDeathEvent.cs index ce102e77..cc0330c3 100644 --- a/QSB/Events/PlayerDeathEvent.cs +++ b/QSB/Events/PlayerDeathEvent.cs @@ -24,5 +24,10 @@ namespace QSB.Events var deathMessage = Necronomicon.GetPhrase(message.DeathType); DebugLog.ToAll(string.Format(deathMessage, playerName)); } + + public override void OnReceiveLocal(PlayerDeathMessage message) + { + OnReceiveRemote(message); + } } } diff --git a/QSB/Events/PlayerLeaveEvent.cs b/QSB/Events/PlayerLeaveEvent.cs index 4c5879dd..f2ce28d9 100644 --- a/QSB/Events/PlayerLeaveEvent.cs +++ b/QSB/Events/PlayerLeaveEvent.cs @@ -32,6 +32,11 @@ namespace QSB.Events } } + public override void OnReceiveLocal(PlayerLeaveMessage message) + { + OnReceiveRemote(message); + } + private void DestroyObject(uint objectId) { var component = Object.FindObjectsOfType() diff --git a/QSB/Events/PlayerSectorEvent.cs b/QSB/Events/PlayerSectorEvent.cs index d8167df4..11a5c9dd 100644 --- a/QSB/Events/PlayerSectorEvent.cs +++ b/QSB/Events/PlayerSectorEvent.cs @@ -38,5 +38,10 @@ namespace QSB.Events DebugLog.ToScreen($"{transformSync.GetType().Name} of ID {message.SenderId} set to {message.SectorName}"); transformSync.ReferenceTransform = sector.transform; } + + public override void OnReceiveLocal(SectorMessage message) + { + OnReceiveRemote(message); + } } } diff --git a/QSB/Events/QSBEvent.cs b/QSB/Events/QSBEvent.cs index 76743036..86171745 100644 --- a/QSB/Events/QSBEvent.cs +++ b/QSB/Events/QSBEvent.cs @@ -42,7 +42,6 @@ namespace QSB.Events /// public virtual void OnReceiveRemote(T message) { - } /// @@ -51,7 +50,6 @@ namespace QSB.Events /// public virtual void OnReceiveLocal(T message) { - OnReceiveRemote(message); } /// diff --git a/QSB/GeyserSync/GeyserEvent.cs b/QSB/GeyserSync/GeyserEvent.cs index e7a074b6..0b06bdad 100644 --- a/QSB/GeyserSync/GeyserEvent.cs +++ b/QSB/GeyserSync/GeyserEvent.cs @@ -26,7 +26,7 @@ namespace QSB.GeyserSync public override void OnReceiveRemote(GeyserMessage message) { - if (!IsInUniverse || message.SenderId == PlayerRegistry.LocalPlayer.NetId) + if (!IsInUniverse) { return; }