pvs content (#5484)

Co-authored-by: Paul <ritter.paul1+git@googlemail.com>

Content.IntegrationTests/Tests/Buckle/BuckleTest.cs

@@ -99,7 +99,7 @@ namespace Content.IntegrationTests.Tests.Buckle
                 Assert.True(buckle.Buckled);
 
                 var player = IoCManager.Resolve<IPlayerManager>().Sessions.Single();
-                Assert.True(((BuckleComponentState) buckle.GetComponentState(player)).Buckled);
+                Assert.True(((BuckleComponentState) buckle.GetComponentState()).Buckled);
                 Assert.False(actionBlocker.CanMove(human.Uid));
                 Assert.False(actionBlocker.CanChangeDirection(human.Uid));
                 Assert.False(standingState.Down(human.Uid));

Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs

@@ -418,7 +418,7 @@ namespace Content.IntegrationTests.Tests.Networking
                 Foo = pred.Foo;
             }
 
-            public override ComponentState GetComponentState(ICommonSession player)
+            public override ComponentState GetComponentState()
             {
                 return new PredictionComponentState(Foo);
             }

Content.Server/Atmos/Components/GasAnalyzerComponent.cs

@@ -42,7 +42,7 @@ namespace Content.Server.Atmos.Components
             Owner.TryGetComponent(out _appearance);
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new GasAnalyzerComponentState(_pressureDanger);
         }

Content.Server/Buckle/Components/BuckleComponent.cs

@@ -390,7 +390,7 @@ namespace Content.Server.Buckle.Components
             base.Shutdown();
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             int? drawDepth = null;
 

Content.Server/Buckle/Components/StrapComponent.cs

@@ -158,7 +158,7 @@ namespace Content.Server.Buckle.Components
             _occupiedSize = 0;
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new StrapComponentState(Position);
         }

Content.Server/Cargo/Components/CargoOrderDatabaseComponent.cs

@@ -17,7 +17,7 @@ namespace Content.Server.Cargo.Components
             Database = EntitySystem.Get<CargoConsoleSystem>().StationOrderDatabase;
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             if (!ConnectedToDatabase)
                 return new CargoOrderDatabaseState(null);

Content.Server/Cargo/Components/GalacticMarketComponent.cs

@@ -7,7 +7,7 @@ namespace Content.Server.Cargo.Components
     [RegisterComponent]
     public class GalacticMarketComponent : SharedGalacticMarketComponent
     {
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new GalacticMarketState(GetProductIdList());
         }

Content.Server/Chemistry/Components/HyposprayComponent.cs

@@ -122,7 +122,7 @@ namespace Content.Server.Chemistry.Components
             return true;
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             var solutionSys = Owner.EntityManager.EntitySysManager.GetEntitySystem<SolutionContainerSystem>();
             return solutionSys.TryGetSolution(Owner.Uid, SolutionName, out var solution)

Content.Server/Chemistry/Components/InjectorComponent.cs

@@ -313,7 +313,7 @@ namespace Content.Server.Chemistry.Components
         }
 
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             Owner.EntityManager.EntitySysManager.GetEntitySystem<SolutionContainerSystem>()
                 .TryGetSolution(Owner.Uid, SolutionName, out var solution);

Content.Server/Climbing/Components/ClimbingComponent.cs

@@ -99,7 +99,7 @@ namespace Content.Server.Climbing.Components
                 IsClimbing = false;
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new ClimbModeComponentState(_isClimbing, OwnerIsTransitioning);
         }

Content.Server/Clothing/Components/ClothingComponent.cs

@@ -52,7 +52,7 @@ namespace Content.Server.Clothing.Components
             }
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new ClothingComponentState(ClothingEquippedPrefix, EquippedPrefix);
         }

Content.Server/Clothing/Components/MagbootsComponent.cs

@@ -114,7 +114,7 @@ namespace Content.Server.Clothing.Components
             Toggle(eventArgs.User);
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new MagbootsComponentState(On);
         }

Content.Server/Crayon/CrayonComponent.cs

@@ -89,7 +89,7 @@ namespace Content.Server.Crayon
             }
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new CrayonComponentState(_color, SelectedState, Charges, Capacity);
         }

Content.Server/Cuffs/Components/CuffableComponent.cs

@@ -56,7 +56,7 @@ namespace Content.Server.Cuffs.Components
             Owner.EnsureComponentWarn<HandsComponent>();
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             // there are 2 approaches i can think of to handle the handcuff overlay on players
             // 1 - make the current RSI the handcuff type that's currently active. all handcuffs on the player will appear the same.

Content.Server/Cuffs/Components/HandcuffComponent.cs

@@ -138,7 +138,7 @@ namespace Content.Server.Cuffs.Components
         /// </summary>
         private bool _cuffing;
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new HandcuffedComponentState(Broken ? BrokenState : string.Empty);
         }

Content.Server/DoAfter/DoAfterComponent.cs

@@ -15,7 +15,7 @@ namespace Content.Server.DoAfter
         // we'll just send them the index. Doesn't matter if it wraps around.
         private byte _runningIndex;
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             var toAdd = new List<ClientDoAfter>();
 

Content.Server/Doors/Components/ServerDoorComponent.cs

@@ -769,7 +769,7 @@ namespace Content.Server.Doors.Components
             */
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new DoorComponentState(State, StateChangeStartTime, CurrentlyCrushing, GameTiming.CurTime);
         }

Content.Server/Inventory/Components/InventoryComponent.cs

@@ -517,7 +517,7 @@ namespace Content.Server.Inventory.Components
             }
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             var list = new List<KeyValuePair<Slots, EntityUid>>();
             foreach (var (slot, container) in _slotContainers)

Content.Server/Lathe/Components/LatheDatabaseComponent.cs

@@ -18,7 +18,7 @@ namespace Content.Server.Lathe.Components
         [DataField("static")]
         public bool Static { get; private set; } = false;
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new LatheDatabaseState(GetRecipeIdList());
         }

Content.Server/Lathe/Components/MaterialStorageComponent.cs

@@ -22,7 +22,7 @@ namespace Content.Server.Lathe.Components
         [DataField("StorageLimit")]
         private int _storageLimit = -1;
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new MaterialStorageState(Storage);
         }

Content.Server/Lathe/Components/ProtolatheDatabaseComponent.cs

@@ -17,7 +17,7 @@ namespace Content.Server.Lathe.Components
 
         public override string Name => "ProtolatheDatabase";
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new ProtolatheDatabaseState(GetRecipeIdList());
         }

Content.Server/Light/Components/HandheldLightComponent.cs

@@ -241,7 +241,7 @@ namespace Content.Server.Light.Components
             return (byte?) ContentHelpers.RoundToNearestLevels(currentCharge / Cell.MaxCharge * 255, 255, StatusLevels);
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new HandheldLightComponentState(GetLevel());
         }

Content.Server/Nutrition/Components/HungerComponent.cs

@@ -223,7 +223,7 @@ namespace Content.Server.Nutrition.Components
             UpdateCurrentThreshold();
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new HungerComponentState(_currentHungerThreshold);
         }

Content.Server/Nutrition/Components/ThirstComponent.cs

@@ -220,7 +220,7 @@ namespace Content.Server.Nutrition.Components
             UpdateCurrentThreshold();
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new ThirstComponentState(_currentThirstThreshold);
         }

Content.Server/Projectiles/Components/ProjectileComponent.cs

@@ -38,7 +38,7 @@ namespace Content.Server.Projectiles.Components
             Dirty();
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new ProjectileComponentState(Shooter, IgnoreShooter);
         }

Content.Server/Radiation/RadiationPulseComponent.cs

@@ -98,7 +98,7 @@ namespace Content.Server.Radiation
             Dirty();
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new RadiationPulseState(_radsPerSecond, _range, Draw, Decay, _endTime);
         }

Content.Server/Research/Components/TechnologyDatabaseComponent.cs

@@ -8,7 +8,7 @@ namespace Content.Server.Research.Components
     [RegisterComponent]
     public class  TechnologyDatabaseComponent : SharedTechnologyDatabaseComponent
     {
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new TechnologyDatabaseState(_technologies);
         }

Content.Server/Singularity/Components/ServerSingularityComponent.cs

@@ -73,7 +73,7 @@ namespace Content.Server.Singularity.Components
         [DataField("singularityFormingSound")] private SoundSpecifier _singularityFormingSound = new SoundPathSpecifier("/Audio/Effects/singularity_form.ogg");
         [DataField("singularityCollapsingSound")] private SoundSpecifier _singularityCollapsingSound = new SoundPathSpecifier("/Audio/Effects/singularity_collapse.ogg");
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new SingularityComponentState(Level);
         }

Content.Server/Suspicion/SuspicionRoleComponent.cs

@@ -142,7 +142,7 @@ namespace Content.Server.Suspicion
             message.AddMarkup(tooltip);
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             if (Role == null)
             {

Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs

@@ -117,7 +117,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
             UpdateAppearance();
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             (int, int)? count = (ShotsLeft, Capacity);
             var chamberedExists = _chamberContainer.ContainedEntity != null;

Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs

@@ -78,7 +78,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
             UpdateAppearance();
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             (int, int)? count = (ShotsLeft, Capacity);
             var chamberedExists = _chamberContainer.ContainedEntity != null;

Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs

@@ -75,7 +75,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
             _ammoSlots = new IEntity[_serializedCapacity];
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             var slotsSpent = new bool?[Capacity];
             for (var i = 0; i < Capacity; i++)

Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs

@@ -81,7 +81,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
         [DataField("soundPowerCellEject", required: true)]
         private SoundSpecifier _soundPowerCellEject = default!;
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             (int, int)? count = (ShotsLeft, Capacity);
 

Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs

@@ -149,7 +149,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
             return types;
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             (int, int)? count = null;
             var magazine = MagazineContainer.ContainedEntity;

Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs

@@ -134,7 +134,7 @@ namespace Content.Server.Weapon.Ranged
             }
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new RangedWeaponComponentState(FireRateSelector);
         }

Content.Shared/Actions/Components/SharedActionsComponent.cs

@@ -75,7 +75,7 @@ namespace Content.Shared.Actions.Components
         }
 
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new ActionComponentState(_actions, _itemActions);
         }

Content.Shared/Alert/SharedAlertsComponent.cs

@@ -36,7 +36,7 @@ namespace Content.Shared.Alert
             _alerts = state.Alerts;
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new AlertsComponentState(_alerts);
         }

Content.Shared/Body/Components/SharedBodyComponent.cs

@@ -547,7 +547,7 @@ namespace Content.Shared.Body.Components
             return SlotParts.ElementAt(index);
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             var parts = new (string slot, EntityUid partId)[SlotParts.Count];
 

Content.Shared/Body/Components/SharedBodyPartComponent.cs

@@ -138,7 +138,7 @@ namespace Content.Shared.Body.Components
             Dirty();
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             var mechanismIds = new EntityUid[_mechanisms.Count];
 

Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs

@@ -31,7 +31,7 @@ namespace Content.Shared.Chemistry.Components
         [ViewVariables]
         public TimeSpan ModifierTimer { get; set; } = TimeSpan.Zero;
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new MovespeedModifierMetabolismComponentState(WalkSpeedModifier, SprintSpeedModifier, ModifierTimer);
         }

Content.Shared/CombatMode/SharedCombatModeComponent.cs

@@ -65,7 +65,7 @@ namespace Content.Shared.CombatMode
         }
 
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new CombatModeComponentState(IsInCombatMode, ActiveZone);
         }

Content.Shared/Cooldown/ItemCooldownComponent.cs

@@ -53,7 +53,7 @@ namespace Content.Shared.Cooldown
             }
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new ItemCooldownComponentState
             {

Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs

@@ -68,7 +68,7 @@ namespace Content.Shared.Disposal.Components
             Pressurizing
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new DisposalUnitComponentState(RecentlyEjected);
         }

Content.Shared/Emoting/SharedEmotingComponent.cs

@@ -28,7 +28,7 @@ namespace Content.Shared.Emoting
             }
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new EmotingComponentState(Enabled);
         }

Content.Shared/Flash/SharedFlashSystem.cs

@@ -10,14 +10,18 @@ namespace Content.Shared.Flash
             base.Initialize();
 
             SubscribeLocalEvent<SharedFlashableComponent, ComponentGetState>(OnFlashableGetState);
+            SubscribeLocalEvent<SharedFlashableComponent, ComponentGetStateAttemptEvent>(OnGetStateAttempt);
+        }
+
+        private void OnGetStateAttempt(EntityUid uid, SharedFlashableComponent component, ComponentGetStateAttemptEvent args)
+        {
+            // Only send state to the player attached to the entity.
+            if (args.Player.AttachedEntityUid != uid)
+                args.Cancel();
         }
 
         private void OnFlashableGetState(EntityUid uid, SharedFlashableComponent component, ref ComponentGetState args)
         {
-            // Only send state to the player attached to the entity.
-            if (args.Player.AttachedEntityUid != uid)
-                return;
-
             args.State = new FlashableComponentState(component.Duration, component.LastFlash);
         }
     }

Content.Shared/Friction/TileFrictionModifier.cs

@@ -31,7 +31,7 @@ namespace Content.Shared.Friction
         [DataField("modifier")]
         private float _modifier = 1.0f;
 
-        public override ComponentState GetComponentState(ICommonSession session)
+        public override ComponentState GetComponentState()
         {
             return new TileFrictionComponentState(_modifier);
         }

Content.Shared/Ghost/SharedGhostComponent.cs

@@ -47,7 +47,7 @@ namespace Content.Shared.Ghost
         [DataField("canReturnToBody")]
         private bool _canReturnToBody;
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new GhostComponentState(CanReturnToBody, CanGhostInteract);
         }

Content.Shared/Gravity/GravityComponent.cs

@@ -41,7 +41,7 @@ namespace Content.Shared.Gravity
 
         private bool _enabled;
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new GravityComponentState(_enabled);
         }

Content.Shared/Hands/Components/HandVirtualItemComponent.cs

@@ -26,7 +26,7 @@ namespace Content.Shared.Hands.Components
             }
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new VirtualItemComponentState(BlockingEntity);
         }

Content.Shared/Hands/Components/SharedHandsComponent.cs

@@ -78,7 +78,7 @@ namespace Content.Shared.Hands.Components
         [ViewVariables(VVAccess.ReadWrite)]
         public float ThrowRange { get; set; } = 8f;
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             var hands = new HandState[Hands.Count];
 

Content.Shared/Item/SharedItemComponent.cs

@@ -88,7 +88,7 @@ namespace Content.Shared.Item
         [DataField("sprite")]
         private string? _rsiPath;
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new ItemComponentState(Size, EquippedPrefix, Color, RsiPath);
         }

Content.Shared/MobState/Components/MobStateComponent.cs

@@ -73,7 +73,7 @@ namespace Content.Shared.MobState.Components
             base.OnRemove();
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new MobStateComponentState(CurrentThreshold);
         }

Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs

@@ -198,7 +198,7 @@ namespace Content.Shared.Movement.Components
             }
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new MoverComponentState(_heldMoveButtons);
         }

Content.Shared/Movement/Components/SharedPlayerMobMoverComponent.cs

@@ -91,7 +91,7 @@ namespace Content.Shared.Movement.Components
             }
         }
 
-        public override ComponentState GetComponentState(ICommonSession session)
+        public override ComponentState GetComponentState()
         {
             return new PlayerMobMoverComponentState(_grabRange, _pushStrength, _weightlessStrength);
         }

Content.Shared/Placeable/PlaceableSurfaceComponent.cs

@@ -28,7 +28,7 @@ namespace Content.Shared.Placeable
         [DataField("positionOffset")]
         public Vector2 PositionOffset { get; set; }
 
-        public override ComponentState GetComponentState(ICommonSession session)
+        public override ComponentState GetComponentState()
         {
             return new PlaceableSurfaceComponentState(IsPlaceable,PlaceCentered, PositionOffset);
         }

Content.Shared/Pulling/Components/PullableComponent.cs

@@ -38,7 +38,7 @@ namespace Content.Shared.Pulling.Components
 
         public EntityCoordinates? MovingTo { get; set; }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new PullableComponentState(Puller?.Uid);
         }

Content.Shared/Shuttles/Components/PilotComponent.cs

@@ -47,7 +47,7 @@ namespace Content.Shared.Shuttles.Components
             Console = shuttleConsoleComponent;
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new PilotComponentState(Console?.OwnerUid);
         }

Content.Shared/Singularity/Components/SingularityDistortionComponent.cs

@@ -34,7 +34,7 @@ namespace Content.Shared.Singularity.Components
             set => this.SetAndDirtyIfChanged(ref _falloff, value);
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new SingularityDistortionComponentState(Intensity, Falloff);
         }

Content.Shared/Slippery/SlipperyComponent.cs

@@ -138,7 +138,7 @@ namespace Content.Shared.Slippery
             }
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new SlipperyComponentState(ParalyzeTime, IntersectPercentage, RequiredSlipSpeed, LaunchForwardsMultiplier, Slippery, SlipSound.GetSound(), Slipped.ToArray());
         }

Content.Shared/Standing/StandingStateComponent.cs

@@ -24,7 +24,7 @@ namespace Content.Shared.Standing
         [DataField("standing")]
         public bool Standing { get; set; } = true;
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new StandingComponentState(Standing);
         }

Content.Shared/SubFloor/SubFloorHideComponent.cs

@@ -35,7 +35,7 @@ namespace Content.Shared.SubFloor
         [DataField("requireAnchored")]
         public bool RequireAnchored { get; set; } = true;
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             return new SubFloorHideComponentState(Enabled, RequireAnchored);
         }

Content.Shared/Tag/TagComponent.cs

@@ -32,7 +32,7 @@ namespace Content.Shared.Tag
             }
         }
 
-        public override ComponentState GetComponentState(ICommonSession player)
+        public override ComponentState GetComponentState()
         {
             var tags = new string[_tags.Count];
             var i = 0;

Content.Tests/Server/GameObjects/Components/Mobs/ServerAlertsComponentTests.cs

@@ -52,18 +52,18 @@ namespace Content.Tests.Server.GameObjects.Components.Mobs
             Assert.That(alertManager.TryGet(AlertType.HighPressure, out var highpressure));
 
             alertsComponent.ShowAlert(AlertType.LowPressure);
-            var alertState = alertsComponent.GetComponentState(null) as AlertsComponentState;
+            var alertState = alertsComponent.GetComponentState() as AlertsComponentState;
             Assert.NotNull(alertState);
             Assert.That(alertState.Alerts.Count, Is.EqualTo(1));
             Assert.That(alertState.Alerts.ContainsKey(lowpressure.AlertKey));
 
             alertsComponent.ShowAlert(AlertType.HighPressure);
-            alertState = alertsComponent.GetComponentState(null) as AlertsComponentState;
+            alertState = alertsComponent.GetComponentState() as AlertsComponentState;
             Assert.That(alertState.Alerts.Count, Is.EqualTo(1));
             Assert.That(alertState.Alerts.ContainsKey(highpressure.AlertKey));
 
             alertsComponent.ClearAlertCategory(AlertCategory.Pressure);
-            alertState = alertsComponent.GetComponentState(null) as AlertsComponentState;
+            alertState = alertsComponent.GetComponentState() as AlertsComponentState;
             Assert.That(alertState.Alerts.Count, Is.EqualTo(0));
         }
     }