- SCP-330 use count is now kept after viewing cameras

 - Added try catch to ensure errors don't result in the player being kicked

Author: gamendegamer321

CameraSystem-LabAPI/CameraSystem-LabAPI.csproj

@@ -89,6 +89,7 @@
         <Compile Include="Models\Watcher.cs" />
         <Compile Include="Models\WorkstationConfig.cs" />
         <Compile Include="Patches\Scp079ScanningPossiblePatch.cs" />
+        <Compile Include="Patches\Scp330InterobjectPatch.cs" />
         <Compile Include="Patches\WorkstationActivationPatch.cs" />
         <Compile Include="Properties\AssemblyInfo.cs"/>
     </ItemGroup>

CameraSystem-LabAPI/Managers/CameraManager.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using CameraSystem.Models;
+using Footprinting;
+using Interactables.Interobjects;
 using InventorySystem.Items.Firearms.Attachments;
 using LabApi.Features.Wrappers;
 using MEC;
@@ -23,6 +25,7 @@ internal sealed class CameraManager : IDisposable
     internal bool IsCameraSystemEnabled { get; private set; } =
         CameraSystem.Instance.Config.IsCameraSystemEnabledByDefault;
 
+    internal static Scp330Interobject Scp330Interobject;
     internal List<WorkstationController> WorkstationControllers { get; set; } = new();
 
     private readonly List<Watcher> _watchers = new();
@@ -56,6 +59,16 @@ internal void Disconnect(Player player, DamageHandlerBase damageHandler = null)
             watcher.Player.ArtificialHealth = watcher.PlayerSnapshot.ArtificialHealth;
             watcher.Player.Health = watcher.PlayerSnapshot.Health;
 
+            if (Scp330Interobject != null)
+            {
+                var current330Count = Scp330Interobject.PreviousUses
+                    .Count(x => x.LifeIdentifier == watcher.Player.RoleBase.UniqueLifeIdentifier);
+                for (var i = current330Count; i < watcher.PlayerSnapshot.Scp330Uses; i++)
+                {
+                    Scp330Interobject.PreviousUses.Add(new Footprint(watcher.Player.ReferenceHub));
+                }
+            }
+
             foreach (var pair in watcher.PlayerSnapshot.Ammo)
             {
                 watcher.Player.SetAmmo(pair.Key, pair.Value);

CameraSystem-LabAPI/Models/PlayerSnapshot.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using CameraSystem.Managers;
 using CustomPlayerEffects;
 using LabApi.Features.Wrappers;
 using PlayerRoles;
@@ -22,6 +23,7 @@ internal class PlayerSnapshot
     internal Vector3 Scale { get; }
     internal Quaternion Rotation { get; }
     internal string Nickname { get; }
+    internal int Scp330Uses { get; }
 
     internal PlayerSnapshot(Player player)
     {
@@ -40,5 +42,11 @@ internal PlayerSnapshot(Player player)
         Scale = player.Scale;
         Rotation = player.Rotation;
         Nickname = player.Nickname;
+
+        if (CameraManager.Scp330Interobject != null)
+        {
+            Scp330Uses = CameraManager.Scp330Interobject.PreviousUses
+                .Count(x => x.LifeIdentifier == player.RoleBase.UniqueLifeIdentifier);
+        }
     }
 }

CameraSystem-LabAPI/Patches/Scp330InterobjectPatch.cs

@@ -0,0 +1,17 @@
+using CameraSystem.Managers;
+using HarmonyLib;
+using Interactables.Interobjects;
+
+namespace CameraSystem.Patches;
+
+[HarmonyPatch]
+public static class Scp330InterobjectPatch
+{
+    [HarmonyPatch(typeof(Scp330Interobject), nameof(Scp330Interobject.ServerInteract))]
+    [HarmonyPostfix]
+    // ReSharper disable once InconsistentNaming
+    public static void On330Interact(Scp330Interobject __instance)
+    {
+        CameraManager.Scp330Interobject = __instance;
+    }
+}

CameraSystem-LabAPI/Patches/WorkstationActivationPatch.cs

@@ -1,5 +1,7 @@
-using HarmonyLib;
+using System;
+using HarmonyLib;
 using InventorySystem.Items.Firearms.Attachments;
+using LabApi.Features.Console;
 using LabApi.Features.Wrappers;
 
 namespace CameraSystem.Patches;
@@ -11,6 +13,14 @@ public static class WorkstationActivationPatch
     // ReSharper disable once InconsistentNaming
     public static bool OnEnterWorkstation(ReferenceHub ply, WorkstationController __instance)
     {
-        return EventHandlers.OnActivatingWorkstation(Player.Get(ply), __instance);
+        try
+        {
+            return EventHandlers.OnActivatingWorkstation(Player.Get(ply), __instance);
+        }
+        catch (Exception e)
+        {
+            Logger.Error($"Failed to connect player: {e}");
+            return true;
+        }
     }
 }