- Fixed camera being able to open doors

 - Fixed workstations enabling
 - Fixed player being unable to disconnect

Author: gamendegamer321

CameraSystem-LabAPI/EventHandlers.cs

@@ -49,6 +49,7 @@ internal static void Register()
 
         PlayerEvents.TriggeringTesla += OnPlayerEvent;
         PlayerEvents.InteractingElevator += OnPlayerEvent;
+        PlayerEvents.InteractingDoor += OnOpenDoor;
         PlayerEvents.Hurting += OnHurting;
         PlayerEvents.Cuffing += OnHandcuffing;
         PlayerEvents.Left += OnLeft;
@@ -72,6 +73,7 @@ internal static void Unregister()
 
         PlayerEvents.TriggeringTesla -= OnPlayerEvent;
         PlayerEvents.InteractingElevator -= OnPlayerEvent;
+        PlayerEvents.InteractingDoor -= OnOpenDoor;
         PlayerEvents.Hurting -= OnHurting;
         PlayerEvents.Cuffing -= OnHandcuffing;
         PlayerEvents.Left -= OnLeft;
@@ -235,4 +237,12 @@ private static void OnVoiceChatting(IPlayerEvent ev)
             cancellableEvent.IsAllowed = false;
         }
     }
+
+    private static void OnOpenDoor(PlayerInteractingDoorEventArgs ev)
+    {
+        if (CameraManager.Instance.IsWatching(ev.Player))
+        {
+            ev.IsAllowed = false;
+        }
+    }
 }

CameraSystem-LabAPI/Managers/CameraManager.cs

@@ -44,11 +44,11 @@ internal void Connect(Player player)
 
     internal void Disconnect(Player player, DamageHandlerBase damageHandler = null)
     {
-        if (!TryGetWatcher(player, out var watcher) || watcher.Player.IsOnline)
+        if (!TryGetWatcher(player, out var watcher) || watcher.Player.IsOffline)
         {
             return;
         }
-
+        
         try
         {
             watcher.Player.SetRole(watcher.PlayerSnapshot.Role, flags: RoleSpawnFlags.None);

CameraSystem-LabAPI/Models/Watcher.cs

@@ -2,6 +2,7 @@
 using MEC;
 using Mirror;
 using NetworkManagerUtils.Dummies;
+using UnityEngine;
 
 namespace CameraSystem.Models;
 
@@ -32,7 +33,7 @@ private ReferenceHub SpawnNpc()
         var hub = DummyUtils.SpawnDummy(PlayerSnapshot.Nickname);
         var npcPlayer = Player.Get(hub);
         npcPlayer.SetRole(PlayerSnapshot.Role);
-        npcPlayer.Position = PlayerSnapshot.Position;
+        npcPlayer.Position = PlayerSnapshot.Position + Vector3.up * 0.1f;
 
         var newCustomInfo = PlayerSnapshot.CustomInfo +
                             CameraSystem.Instance.Config?.Translations.WatchingCamerasPostfix;

CameraSystem-LabAPI/Patches/WorkstationActivationPatch.cs

@@ -9,8 +9,8 @@ public static class WorkstationActivationPatch
 {
     [HarmonyPrefix]
     // ReSharper disable once InconsistentNaming
-    public static void OnEnterWorkstation(ReferenceHub ply, WorkstationController __instance)
+    public static bool OnEnterWorkstation(ReferenceHub ply, WorkstationController __instance)
     {
-        EventHandlers.OnActivatingWorkstation(Player.Get(ply), __instance);
+        return EventHandlers.OnActivatingWorkstation(Player.Get(ply), __instance);
     }
 }