diff --git a/QSB/EchoesOfTheEye/AlarmTotemSync/Messages/TotemFaceOpenMessage.cs b/QSB/EchoesOfTheEye/AlarmTotemSync/Messages/TotemFaceOpenMessage.cs deleted file mode 100644 index f03e3a5e..00000000 --- a/QSB/EchoesOfTheEye/AlarmTotemSync/Messages/TotemFaceOpenMessage.cs +++ /dev/null @@ -1,13 +0,0 @@ -using QSB.EchoesOfTheEye.AlarmTotemSync.WorldObjects; -using QSB.Messaging; -using QSB.Patches; - -namespace QSB.EchoesOfTheEye.AlarmTotemSync.Messages; - -public class TotemFaceOpenMessage : QSBWorldObjectMessage -{ - public TotemFaceOpenMessage(bool open) : base(open) { } - - public override void OnReceiveRemote() => - QSBPatch.RemoteCall(() => WorldObject.AttachedObject.SetFaceOpen(Data)); -} diff --git a/QSB/EchoesOfTheEye/AlarmTotemSync/Patches/AlarmTotemPatches.cs b/QSB/EchoesOfTheEye/AlarmTotemSync/Patches/AlarmTotemPatches.cs index df0c4ef3..bebdf5f1 100644 --- a/QSB/EchoesOfTheEye/AlarmTotemSync/Patches/AlarmTotemPatches.cs +++ b/QSB/EchoesOfTheEye/AlarmTotemSync/Patches/AlarmTotemPatches.cs @@ -12,29 +12,6 @@ public class AlarmTotemPatches : QSBPatch { public override QSBPatchTypes Type => QSBPatchTypes.OnClientConnect; - [HarmonyPrefix] - [HarmonyPatch(typeof(AlarmTotem), nameof(AlarmTotem.SetFaceOpen))] - private static void SetFaceOpen(AlarmTotem __instance, bool open) - { - if (Remote) - { - return; - } - - if (__instance._isFaceOpen == open) - { - return; - } - - if (!QSBWorldSync.AllObjectsReady) - { - return; - } - - __instance.GetWorldObject() - .SendMessage(new TotemFaceOpenMessage(open)); - } - [HarmonyPrefix] [HarmonyPatch(typeof(AlarmTotem), nameof(AlarmTotem.OnSectorOccupantAdded))] private static void OnSectorOccupantAdded(AlarmTotem __instance, SectorDetector sectorDetector) diff --git a/QSB/EchoesOfTheEye/AlarmTotemSync/WorldObjects/QSBAlarmTotem.cs b/QSB/EchoesOfTheEye/AlarmTotemSync/WorldObjects/QSBAlarmTotem.cs index 96214fb0..031733d5 100644 --- a/QSB/EchoesOfTheEye/AlarmTotemSync/WorldObjects/QSBAlarmTotem.cs +++ b/QSB/EchoesOfTheEye/AlarmTotemSync/WorldObjects/QSBAlarmTotem.cs @@ -15,7 +15,6 @@ public class QSBAlarmTotem : WorldObject public override void SendInitialState(uint to) { - this.SendMessage(new TotemFaceOpenMessage(AttachedObject._isFaceOpen) { To = to }); this.SendMessage(new TotemEnabledMessage(AttachedObject.enabled) { To = to }); this.SendMessage(new TotemVisibleForMessage(VisibleFor) { To = to }); } diff --git a/QSB/Utility/DebugActions.cs b/QSB/Utility/DebugActions.cs index 33320c04..f7b1d78b 100644 --- a/QSB/Utility/DebugActions.cs +++ b/QSB/Utility/DebugActions.cs @@ -60,7 +60,7 @@ public class DebugActions : MonoBehaviour, IAddComponentOnStart { var relativeLocation = new RelativeLocationData(Vector3.up * 2 + Vector3.forward * 2, Quaternion.identity, Vector3.zero); - var location = Keyboard.current[Key.LeftShift].isPressed ? DreamArrivalPoint.Location.Zone4 : DreamArrivalPoint.Location.Zone3; + var location = Keyboard.current[Key.LeftShift].isPressed ? DreamArrivalPoint.Location.Zone4 : DreamArrivalPoint.Location.Zone2; var arrivalPoint = Locator.GetDreamArrivalPoint(location); var dreamCampfire = Locator.GetDreamCampfire(location); if (Locator.GetToolModeSwapper().GetItemCarryTool().GetHeldItemType() != ItemType.DreamLantern)