Fix access for vehicles and mechs (#20737)

* fix access for vehicles and mechs

* optimize

diff --git a/Content.Shared/Access/Systems/AccessReaderSystem.cs b/Content.Shared/Access/Systems/AccessReaderSystem.cs
index 8794500b900641b540d1b85bdab0ef65eeb3b5b0..3c8e61d2275210ec4c9472c72b675e5a5a8b0c23 100644 (file)
--- a/Content.Shared/Access/Systems/AccessReaderSystem.cs
+++ b/Content.Shared/Access/Systems/AccessReaderSystem.cs
@@ -71,7 +71,7 @@ public sealed class AccessReaderSystem : EntitySystem
     {
         args.Handled = true;
         reader.Enabled = false;
-        Dirty(reader);
+        Dirty(uid, reader);
     }
 
     /// <summary>
@@ -183,16 +183,16 @@ public sealed class AccessReaderSystem : EntitySystem
     {
         FindAccessItemsInventory(uid, out var items);
 
-        foreach (var item in new ValueList<EntityUid>(items))
-        {
-            items.UnionWith(FindPotentialAccessItems(item));
-        }
-
         var ev = new GetAdditionalAccessEvent
         {
             Entities = items
         };
         RaiseLocalEvent(uid, ref ev);
+
+        foreach (var item in new ValueList<EntityUid>(items))
+        {
+            items.UnionWith(FindPotentialAccessItems(item));
+        }
         items.Add(uid);
         return items;
     }

diff --git a/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs b/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
index 1cb08e1a25305df23904b68ff7a6b252f70b68ba..2af5ac6e0c3d8af6f797da6e80bec82fa137c56c 100644 (file)
--- a/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
+++ b/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
@@ -1,6 +1,5 @@
 using System.Linq;
 using Content.Shared.Access.Components;
-using Content.Shared.Access.Systems;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Actions;
 using Content.Shared.Destructible;
@@ -30,7 +29,6 @@ public abstract class SharedMechSystem : EntitySystem
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
-    [Dependency] private readonly AccessReaderSystem _access = default!;
     [Dependency] private readonly SharedActionsSystem _actions = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
@@ -105,8 +103,6 @@ public abstract class SharedMechSystem : EntitySystem
             return;
 
         args.Entities.Add(pilot.Value);
-        _access.FindAccessItemsInventory(pilot.Value, out var items);
-        args.Entities.UnionWith(items);
     }
 
     private void SetupUser(EntityUid mech, EntityUid pilot, MechComponent? component = null)

diff --git a/Content.Shared/Vehicle/SharedVehicleSystem.cs b/Content.Shared/Vehicle/SharedVehicleSystem.cs
index 334c115ba8d17d46d476cb9340c7fa9259a0b95d..c211ec57f0232bed5931d7fa0b42454b6bfba8f5 100644 (file)
--- a/Content.Shared/Vehicle/SharedVehicleSystem.cs
+++ b/Content.Shared/Vehicle/SharedVehicleSystem.cs
@@ -1,6 +1,5 @@
 using System.Numerics;
 using Content.Shared.Access.Components;
-using Content.Shared.Access.Systems;
 using Content.Shared.Actions;
 using Content.Shared.Audio;
 using Content.Shared.Buckle;
@@ -35,7 +34,6 @@ public abstract partial class SharedVehicleSystem : EntitySystem
     [Dependency] private readonly SharedAmbientSoundSystem _ambientSound = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly TagSystem _tagSystem = default!;
-    [Dependency] private readonly AccessReaderSystem _access = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedHandVirtualItemSystem _virtualItemSystem = default!;
     [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
@@ -326,11 +324,7 @@ public abstract partial class SharedVehicleSystem : EntitySystem
     {
         if (component.Rider == null)
             return;
-        var rider = component.Rider.Value;
-
-        args.Entities.Add(rider);
-        _access.FindAccessItemsInventory(rider, out var items);
-        args.Entities.UnionWith(items);
+        args.Entities.Add(component.Rider.Value);
     }
 
     /// <summary>