From 964b9ff043884bb5d0fcce8b0b53aeab1d97a734 Mon Sep 17 00:00:00 2001
From: rayzer <rayzerbrain@gmail.com>
Date: Sat, 3 Sep 2022 12:30:52 -0500
Subject: [PATCH] stuff

---
 API/Modifiers/KeycardModifier.cs | 13 +++++------
 ItemUtils.csproj                 | 37 +++-----------------------------
 packages.config                  |  4 ----
 3 files changed, 8 insertions(+), 46 deletions(-)
 delete mode 100644 packages.config

diff --git a/API/Modifiers/KeycardModifier.cs b/API/Modifiers/KeycardModifier.cs
index f34d4e6..e0d714c 100644
--- a/API/Modifiers/KeycardModifier.cs
+++ b/API/Modifiers/KeycardModifier.cs
@@ -14,8 +14,6 @@ namespace ItemUtils.API.Modifiers
 {
     public class KeycardModifier : ItemModifier
     {
-        //Only need to test remote cards
-        
         public bool CanBeUsedRemotely { get; set; } = false;
         public List<KeycardPermissions> AddedPermissions { get; set; } = new List<KeycardPermissions>();
         public List<KeycardPermissions> RemovedPermissions { get; set; } = new List<KeycardPermissions>();
@@ -46,12 +44,11 @@ private bool CheckPermissions(Player plyr, KeycardPermissions perms, bool oldRes
         {
             Log.Debug($"Starting check of permissions {perms}", PluginMain.Instance.Config.DebugMode);
 
-            if (perms == KeycardPermissions.None)
-                return true;
-
-            if (plyr.IsScp)
+            if (perms == KeycardPermissions.None || plyr.IsScp)
                 return oldResult;
 
+            perms &= ~KeycardPermissions.ScpOverride;
+
             if (CanBeUsedRemotely)
             {
                 foreach (Item item in plyr.Items)
@@ -70,8 +67,8 @@ private bool CheckPermissions(Keycard card, KeycardPermissions perms)
 
             if (CanModify(card, card.Owner))
             {
-                newPerms += (ushort)AddedPermissions.Sum((perm) => (ushort)perm);
-                newPerms -= (ushort)RemovedPermissions.Sum((perm) => (ushort)perm);
+                newPerms += (ushort)AddedPermissions.Sum(perm => (ushort)perm);
+                newPerms -= (ushort)RemovedPermissions.Sum(perm => (ushort)perm);
             }
 
             Log.Debug($"Checking permission {perms} against card with perms {newPerms}", PluginMain.Instance.Config.DebugMode);
diff --git a/ItemUtils.csproj b/ItemUtils.csproj
index d5d9404..a9e13b0 100644
--- a/ItemUtils.csproj
+++ b/ItemUtils.csproj
@@ -43,40 +43,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\Downloads\Dev (3)\Assembly-CSharp-Publicized.dll</HintPath>
     </Reference>
-    <Reference Include="CommandSystem.Core, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\EXILED.5.2.1\lib\net472\CommandSystem.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Exiled.API, Version=5.2.1.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>packages\EXILED.5.2.1\lib\net472\Exiled.API.dll</HintPath>
-    </Reference>
-    <Reference Include="Exiled.Bootstrap, Version=5.2.1.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>packages\EXILED.5.2.1\lib\net472\Exiled.Bootstrap.dll</HintPath>
-    </Reference>
-    <Reference Include="Exiled.CreditTags, Version=5.2.1.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>packages\EXILED.5.2.1\lib\net472\Exiled.CreditTags.dll</HintPath>
-    </Reference>
-    <Reference Include="Exiled.CustomItems, Version=5.2.1.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>packages\EXILED.5.2.1\lib\net472\Exiled.CustomItems.dll</HintPath>
-    </Reference>
-    <Reference Include="Exiled.CustomRoles, Version=5.2.1.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>packages\EXILED.5.2.1\lib\net472\Exiled.CustomRoles.dll</HintPath>
-    </Reference>
-    <Reference Include="Exiled.Events, Version=5.2.1.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>packages\EXILED.5.2.1\lib\net472\Exiled.Events.dll</HintPath>
-    </Reference>
-    <Reference Include="Exiled.Loader, Version=5.2.1.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>packages\EXILED.5.2.1\lib\net472\Exiled.Loader.dll</HintPath>
-    </Reference>
-    <Reference Include="Exiled.Permissions, Version=5.2.1.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>packages\EXILED.5.2.1\lib\net472\Exiled.Permissions.dll</HintPath>
-    </Reference>
-    <Reference Include="Exiled.Updater, Version=3.1.1.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>packages\EXILED.5.2.1\lib\net472\Exiled.Updater.dll</HintPath>
-    </Reference>
     <Reference Include="Mirror, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" />
-    <Reference Include="NorthwoodLib, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\EXILED.5.2.1\lib\net472\NorthwoodLib.dll</HintPath>
-    </Reference>
     <Reference Include="SemVer">
       <HintPath>..\..\..\Downloads\Exiledsa\EXILED\Plugins\dependencies\SemVer.dll</HintPath>
     </Reference>
@@ -118,7 +85,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="EXILED">
+      <Version>5.3.0</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/packages.config b/packages.config
deleted file mode 100644
index cfe28c8..0000000
--- a/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="EXILED" version="5.2.1" targetFramework="net472" />
-</packages>
\ No newline at end of file