Merge pull request #36 from Supper-Steve/master

修复感应卡

Author: XLittleLeft

HelpSense/Helper/Misc/KeycardSystem.cs

@@ -23,54 +23,66 @@ public static bool HasKeycardPermission(this DoorVariant door, Player player)
             {
                 return false;
             }
-
+        
             foreach (var keycard in player.ReferenceHub.inventory.UserInventory.Items.Values.Where(t => t is KeycardItem))
             {
-                if (door.RequiredPermissions.CheckPermissions(keycard, player.ReferenceHub))
+                if (door.CheckPermissions((ChaosKeycardItem)keycard, out var __))
+                {
+                    return true;
+                }
+                if (door.CheckPermissions((KeycardItem)keycard, out var __2))
                 {
                     return true;
                 }
             }
-
+        
             return false;
-
+        
         }
-
+        
         public static bool HasKeycardPermission(this LockerChamber chamber, Player player)
         {
             if (CustomEventHandler.Config.AffectAmnesia &&
                 player.GetEffect<CustomPlayerEffects.AmnesiaItems>().IsEnabled)
             {
                 return false;
             }
-
+        
             foreach (var keycard in player.ReferenceHub.inventory.UserInventory.Items.Values.Where(t => t is KeycardItem))
             {
-                if (((KeycardItem)keycard).Permissions.HasFlagFast(chamber.RequiredPermissions))
+                if (chamber.CheckPermissions((ChaosKeycardItem)keycard, out var __))
+                {
+                    return true;
+                }
+                if (chamber.CheckPermissions((KeycardItem)keycard, out var __2))
                 {
                     return true;
                 }
             }
-
+        
             return false;
         }
-
+        
         public static bool HasKeycardPermission(this Scp079Generator generator, Player player)
         {
             if (CustomEventHandler.Config.AffectAmnesia &&
                                 player.GetEffect<CustomPlayerEffects.AmnesiaItems>().IsEnabled && !player.IsBypassEnabled)
             {
                 return false;
             }
-
+        
             foreach (var keycard in player.ReferenceHub.inventory.UserInventory.Items.Values.Where(t => t is KeycardItem))
             {
-                if (((KeycardItem)keycard).Permissions.HasFlagFast(generator._requiredPermission))
+                if (generator.CheckPermissions((ChaosKeycardItem)keycard, out var __))
+                {
+                    return true;
+                }
+                if (generator.CheckPermissions((KeycardItem)keycard, out var __2))
                 {
                     return true;
                 }
             }
-
+        
             return false;
         }
 
@@ -104,4 +116,4 @@ public static void Unlock(this Scp079Generator gen)
             gen.ServerSetFlag(Scp079Generator.GeneratorFlags.Unlocked, true);
         }
     }
-}
+}