From 679657c8030e2897df85c449cbbd914554dcf8f3 Mon Sep 17 00:00:00 2001
From: JohnCorby <williamforgames6@gmail.com>
Date: Sun, 28 Aug 2022 22:22:19 -0700
Subject: [PATCH] actually set Remote

---
 QSB/Messaging/QSBMessageManager.cs              | 3 +++
 QSB/Player/TransformSync/PlayerTransformSync.cs | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/QSB/Messaging/QSBMessageManager.cs b/QSB/Messaging/QSBMessageManager.cs
index b67976c1..2a96c406 100644
--- a/QSB/Messaging/QSBMessageManager.cs
+++ b/QSB/Messaging/QSBMessageManager.cs
@@ -2,6 +2,7 @@
 using OWML.Common;
 using QSB.ClientServerStateSync;
 using QSB.ClientServerStateSync.Messages;
+using QSB.Patches;
 using QSB.Player;
 using QSB.Player.Messages;
 using QSB.Player.TransformSync;
@@ -86,7 +87,9 @@ public static class QSBMessageManager
 
 			if (msg.From != QSBPlayerManager.LocalPlayerId)
 			{
+				QSBPatch.Remote = true;
 				msg.OnReceiveRemote();
+				QSBPatch.Remote = false;
 			}
 			else
 			{
diff --git a/QSB/Player/TransformSync/PlayerTransformSync.cs b/QSB/Player/TransformSync/PlayerTransformSync.cs
index 52fc4d7d..ee2bc73d 100644
--- a/QSB/Player/TransformSync/PlayerTransformSync.cs
+++ b/QSB/Player/TransformSync/PlayerTransformSync.cs
@@ -1,5 +1,6 @@
 using OWML.Common;
 using QSB.Messaging;
+using QSB.Patches;
 using QSB.Player.Messages;
 using QSB.PlayerBodySetup.Local;
 using QSB.PlayerBodySetup.Remote;
@@ -48,7 +49,9 @@ public class PlayerTransformSync : SectoredTransformSync
 		JoinLeaveSingularity.Create(Player, false);
 
 		// TODO : Maybe move this to a leave event...? Would ensure everything could finish up before removing the player
+		QSBPatch.Remote = true;
 		QSBPlayerManager.OnRemovePlayer?.Invoke(Player);
+		QSBPatch.Remote = false;
 		base.OnStopClient();
 		Player.HudMarker?.Remove();
 		QSBPlayerManager.PlayerList.Remove(Player);