Fixed not hearing players through cameras and delayed damage application a frame

Author: gamendegamer321

CameraSystem-LabAPI/EventHandlers.cs

@@ -38,7 +38,6 @@ internal static void Register()
         Scp079Events.Pinging += OnPinging;
         Scp079Events.Recontaining += OnRecontaining;
 
-        // TODO: Make sure camera cannot do anything (opening doors/sending elevators may be possible)
         Scp079Events.BlackingOutRoom += OnPlayerEvent;
         Scp079Events.BlackingOutZone += OnPlayerEvent;
         Scp079Events.ChangingCamera += OnChangingCamera;
@@ -55,8 +54,8 @@ internal static void Register()
         PlayerEvents.Left += OnLeft;
         PlayerEvents.Dying += OnDying;
 
-        PlayerEvents.ReceivingVoiceMessage += OnVoiceChatting;
-        PlayerEvents.SendingVoiceMessage += OnVoiceChatting;
+        PlayerEvents.ReceivingVoiceMessage += OnReceivingVoiceChat;
+        PlayerEvents.SendingVoiceMessage += OnSendingVoiceChat;
     }
 
     internal static void Unregister()
@@ -79,8 +78,8 @@ internal static void Unregister()
         PlayerEvents.Left -= OnLeft;
         PlayerEvents.Dying -= OnDying;
 
-        PlayerEvents.ReceivingVoiceMessage -= OnVoiceChatting;
-        PlayerEvents.SendingVoiceMessage -= OnVoiceChatting;
+        PlayerEvents.ReceivingVoiceMessage -= OnReceivingVoiceChat;
+        PlayerEvents.SendingVoiceMessage -= OnSendingVoiceChat;
     }
 
     private static void OnMapGenerated(MapGeneratedEventArgs _) => SpawnWorkstations();
@@ -228,13 +227,19 @@ private static void OnLeft(PlayerLeftEventArgs ev)
         CameraManager.Instance.ForceDisconnect(ev.Player);
     }
 
-    private static void OnVoiceChatting(IPlayerEvent ev)
+    private static void OnSendingVoiceChat(PlayerSendingVoiceMessageEventArgs ev)
     {
-        if (ev is IVoiceMessageEvent voiceMessageEvent and ICancellableEvent cancellableEvent &&
-            CameraManager.Instance.IsWatching(ev.Player) &&
-            voiceMessageEvent.Message.Channel == VoiceChatChannel.ScpChat)
+        if (CameraManager.Instance.IsWatching(ev.Player))
+        {
+            ev.IsAllowed = false;
+        }
+    }
+
+    private static void OnReceivingVoiceChat(PlayerReceivingVoiceMessageEventArgs ev)
+    {
+        if (ev.Message.Channel == VoiceChatChannel.ScpChat && CameraManager.Instance.IsWatching(ev.Player))
         {
-            cancellableEvent.IsAllowed = false;
+            ev.IsAllowed = false;
         }
     }
 

CameraSystem-LabAPI/Managers/CameraManager.cs

@@ -36,9 +36,7 @@ internal void Connect(Player player)
         Watcher watcher = new(player);
         _watchers.Add(watcher);
 
-        player.SetRole(RoleTypeId.Scp079, flags: RoleSpawnFlags.None);
-        player.CurrentItem = null;
-
+        player.SetRole(RoleTypeId.Scp079);
         player.SendHint(CameraSystem.Instance.Config.Translations.ConnectionSuccessMessage, 7);
     }
 
@@ -48,7 +46,7 @@ internal void Disconnect(Player player, DamageHandlerBase damageHandler = null)
         {
             return;
         }
-        
+
         try
         {
             watcher.Player.SetRole(watcher.PlayerSnapshot.Role, flags: RoleSpawnFlags.None);
@@ -70,7 +68,7 @@ internal void Disconnect(Player player, DamageHandlerBase damageHandler = null)
 
             if (damageHandler is not null && player.IsAlive)
             {
-                watcher.Player.Damage(damageHandler);
+                Timing.CallDelayed(Timing.WaitForOneFrame, () => { watcher.Player.Damage(damageHandler); });
             }
 
             watcher.Player.SendHint(CameraSystem.Instance.Config.Translations.DisconnectionMessage, 7);