diff --git a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs index c99828d77e..d978c81965 100644 --- a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs +++ b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs @@ -99,7 +99,7 @@ namespace Content.IntegrationTests.Tests.Buckle Assert.True(buckle.Buckled); var player = IoCManager.Resolve().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)); diff --git a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs index 85662f29e1..58a0bd7a5e 100644 --- a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs +++ b/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); } diff --git a/Content.Server/Atmos/Components/GasAnalyzerComponent.cs b/Content.Server/Atmos/Components/GasAnalyzerComponent.cs index dd4114736e..d0ff509c2e 100644 --- a/Content.Server/Atmos/Components/GasAnalyzerComponent.cs +++ b/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); } diff --git a/Content.Server/Buckle/Components/BuckleComponent.cs b/Content.Server/Buckle/Components/BuckleComponent.cs index 679f111d4c..afb1356ed1 100644 --- a/Content.Server/Buckle/Components/BuckleComponent.cs +++ b/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; diff --git a/Content.Server/Buckle/Components/StrapComponent.cs b/Content.Server/Buckle/Components/StrapComponent.cs index 33a9dcdef4..0fa44f5f1e 100644 --- a/Content.Server/Buckle/Components/StrapComponent.cs +++ b/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); } diff --git a/Content.Server/Cargo/Components/CargoOrderDatabaseComponent.cs b/Content.Server/Cargo/Components/CargoOrderDatabaseComponent.cs index 4b9f825880..57760739c4 100644 --- a/Content.Server/Cargo/Components/CargoOrderDatabaseComponent.cs +++ b/Content.Server/Cargo/Components/CargoOrderDatabaseComponent.cs @@ -17,7 +17,7 @@ namespace Content.Server.Cargo.Components Database = EntitySystem.Get().StationOrderDatabase; } - public override ComponentState GetComponentState(ICommonSession player) + public override ComponentState GetComponentState() { if (!ConnectedToDatabase) return new CargoOrderDatabaseState(null); diff --git a/Content.Server/Cargo/Components/GalacticMarketComponent.cs b/Content.Server/Cargo/Components/GalacticMarketComponent.cs index 004ea52589..4d5d45a84e 100644 --- a/Content.Server/Cargo/Components/GalacticMarketComponent.cs +++ b/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()); } diff --git a/Content.Server/Chemistry/Components/HyposprayComponent.cs b/Content.Server/Chemistry/Components/HyposprayComponent.cs index 59923a01aa..0d3f23559e 100644 --- a/Content.Server/Chemistry/Components/HyposprayComponent.cs +++ b/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(); return solutionSys.TryGetSolution(Owner.Uid, SolutionName, out var solution) diff --git a/Content.Server/Chemistry/Components/InjectorComponent.cs b/Content.Server/Chemistry/Components/InjectorComponent.cs index 7372574847..a67cd0a4d2 100644 --- a/Content.Server/Chemistry/Components/InjectorComponent.cs +++ b/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() .TryGetSolution(Owner.Uid, SolutionName, out var solution); diff --git a/Content.Server/Climbing/Components/ClimbingComponent.cs b/Content.Server/Climbing/Components/ClimbingComponent.cs index f1d43125e9..eec79514ec 100644 --- a/Content.Server/Climbing/Components/ClimbingComponent.cs +++ b/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); } diff --git a/Content.Server/Clothing/Components/ClothingComponent.cs b/Content.Server/Clothing/Components/ClothingComponent.cs index 238bfede80..98249d4ab8 100644 --- a/Content.Server/Clothing/Components/ClothingComponent.cs +++ b/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); } diff --git a/Content.Server/Clothing/Components/MagbootsComponent.cs b/Content.Server/Clothing/Components/MagbootsComponent.cs index 1360b6fa41..dc000ac78e 100644 --- a/Content.Server/Clothing/Components/MagbootsComponent.cs +++ b/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); } diff --git a/Content.Server/Crayon/CrayonComponent.cs b/Content.Server/Crayon/CrayonComponent.cs index 1541b11886..5290a391eb 100644 --- a/Content.Server/Crayon/CrayonComponent.cs +++ b/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); } diff --git a/Content.Server/Cuffs/Components/CuffableComponent.cs b/Content.Server/Cuffs/Components/CuffableComponent.cs index 1ab0564cc3..367c426388 100644 --- a/Content.Server/Cuffs/Components/CuffableComponent.cs +++ b/Content.Server/Cuffs/Components/CuffableComponent.cs @@ -56,7 +56,7 @@ namespace Content.Server.Cuffs.Components Owner.EnsureComponentWarn(); } - 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. diff --git a/Content.Server/Cuffs/Components/HandcuffComponent.cs b/Content.Server/Cuffs/Components/HandcuffComponent.cs index e1faa8dcdb..6110ff60dc 100644 --- a/Content.Server/Cuffs/Components/HandcuffComponent.cs +++ b/Content.Server/Cuffs/Components/HandcuffComponent.cs @@ -138,7 +138,7 @@ namespace Content.Server.Cuffs.Components /// private bool _cuffing; - public override ComponentState GetComponentState(ICommonSession player) + public override ComponentState GetComponentState() { return new HandcuffedComponentState(Broken ? BrokenState : string.Empty); } diff --git a/Content.Server/DoAfter/DoAfterComponent.cs b/Content.Server/DoAfter/DoAfterComponent.cs index 572c141216..9a68b3ff66 100644 --- a/Content.Server/DoAfter/DoAfterComponent.cs +++ b/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(); diff --git a/Content.Server/Doors/Components/ServerDoorComponent.cs b/Content.Server/Doors/Components/ServerDoorComponent.cs index dda25a89f2..a4916c3e5b 100644 --- a/Content.Server/Doors/Components/ServerDoorComponent.cs +++ b/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); } diff --git a/Content.Server/Inventory/Components/InventoryComponent.cs b/Content.Server/Inventory/Components/InventoryComponent.cs index c161e42679..b8413fbce6 100644 --- a/Content.Server/Inventory/Components/InventoryComponent.cs +++ b/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>(); foreach (var (slot, container) in _slotContainers) diff --git a/Content.Server/Lathe/Components/LatheDatabaseComponent.cs b/Content.Server/Lathe/Components/LatheDatabaseComponent.cs index 0d0623609d..fe589de577 100644 --- a/Content.Server/Lathe/Components/LatheDatabaseComponent.cs +++ b/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()); } diff --git a/Content.Server/Lathe/Components/MaterialStorageComponent.cs b/Content.Server/Lathe/Components/MaterialStorageComponent.cs index 70c8310747..e6ac5313c9 100644 --- a/Content.Server/Lathe/Components/MaterialStorageComponent.cs +++ b/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); } diff --git a/Content.Server/Lathe/Components/ProtolatheDatabaseComponent.cs b/Content.Server/Lathe/Components/ProtolatheDatabaseComponent.cs index 1145cb533a..da8c35cbeb 100644 --- a/Content.Server/Lathe/Components/ProtolatheDatabaseComponent.cs +++ b/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()); } diff --git a/Content.Server/Light/Components/HandheldLightComponent.cs b/Content.Server/Light/Components/HandheldLightComponent.cs index 0eabc03b51..b517a67961 100644 --- a/Content.Server/Light/Components/HandheldLightComponent.cs +++ b/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()); } diff --git a/Content.Server/Nutrition/Components/HungerComponent.cs b/Content.Server/Nutrition/Components/HungerComponent.cs index 94d77abe41..599cb7aa3c 100644 --- a/Content.Server/Nutrition/Components/HungerComponent.cs +++ b/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); } diff --git a/Content.Server/Nutrition/Components/ThirstComponent.cs b/Content.Server/Nutrition/Components/ThirstComponent.cs index 1c5a150dc0..73aee2c905 100644 --- a/Content.Server/Nutrition/Components/ThirstComponent.cs +++ b/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); } diff --git a/Content.Server/Projectiles/Components/ProjectileComponent.cs b/Content.Server/Projectiles/Components/ProjectileComponent.cs index 86f5743f60..d7aeeb3cc5 100644 --- a/Content.Server/Projectiles/Components/ProjectileComponent.cs +++ b/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); } diff --git a/Content.Server/Radiation/RadiationPulseComponent.cs b/Content.Server/Radiation/RadiationPulseComponent.cs index d1c3254da2..6160af7027 100644 --- a/Content.Server/Radiation/RadiationPulseComponent.cs +++ b/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); } diff --git a/Content.Server/Research/Components/TechnologyDatabaseComponent.cs b/Content.Server/Research/Components/TechnologyDatabaseComponent.cs index cc0bc9c11b..ebfbcdd62e 100644 --- a/Content.Server/Research/Components/TechnologyDatabaseComponent.cs +++ b/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); } diff --git a/Content.Server/Singularity/Components/ServerSingularityComponent.cs b/Content.Server/Singularity/Components/ServerSingularityComponent.cs index 031363a906..21f8e4def8 100644 --- a/Content.Server/Singularity/Components/ServerSingularityComponent.cs +++ b/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); } diff --git a/Content.Server/Suspicion/SuspicionRoleComponent.cs b/Content.Server/Suspicion/SuspicionRoleComponent.cs index a2122e1f93..5e683bd518 100644 --- a/Content.Server/Suspicion/SuspicionRoleComponent.cs +++ b/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) { diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs index bb059d7ff2..a59ea86059 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs +++ b/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; diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs index 50509cf1b3..5fba188d50 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs +++ b/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; diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs index ef47085f2b..bb74085113 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs +++ b/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++) diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs index d3706bbd67..71a7ccab61 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs +++ b/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); diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs index 0ffdb708ce..67fd481c56 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs +++ b/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; diff --git a/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs b/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs index bc46a3edfc..fca615909f 100644 --- a/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs +++ b/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); } diff --git a/Content.Shared/Actions/Components/SharedActionsComponent.cs b/Content.Shared/Actions/Components/SharedActionsComponent.cs index 9bd79dac06..c470c7e1fa 100644 --- a/Content.Shared/Actions/Components/SharedActionsComponent.cs +++ b/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); } diff --git a/Content.Shared/Alert/SharedAlertsComponent.cs b/Content.Shared/Alert/SharedAlertsComponent.cs index 06e112a9c7..db7859a482 100644 --- a/Content.Shared/Alert/SharedAlertsComponent.cs +++ b/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); } diff --git a/Content.Shared/Body/Components/SharedBodyComponent.cs b/Content.Shared/Body/Components/SharedBodyComponent.cs index 0a756c7478..9e9102af05 100644 --- a/Content.Shared/Body/Components/SharedBodyComponent.cs +++ b/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]; diff --git a/Content.Shared/Body/Components/SharedBodyPartComponent.cs b/Content.Shared/Body/Components/SharedBodyPartComponent.cs index 9e6d2509ab..f1424ec26e 100644 --- a/Content.Shared/Body/Components/SharedBodyPartComponent.cs +++ b/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]; diff --git a/Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs b/Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs index e4c5a9dd9b..bce2e2028d 100644 --- a/Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs +++ b/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); } diff --git a/Content.Shared/CombatMode/SharedCombatModeComponent.cs b/Content.Shared/CombatMode/SharedCombatModeComponent.cs index faaf00b3cc..cbff6568b1 100644 --- a/Content.Shared/CombatMode/SharedCombatModeComponent.cs +++ b/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); } diff --git a/Content.Shared/Cooldown/ItemCooldownComponent.cs b/Content.Shared/Cooldown/ItemCooldownComponent.cs index 7dd2d2544a..e36ddcde5f 100644 --- a/Content.Shared/Cooldown/ItemCooldownComponent.cs +++ b/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 { diff --git a/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs index f550337a5a..0dd87f7de7 100644 --- a/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs +++ b/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); } diff --git a/Content.Shared/Emoting/SharedEmotingComponent.cs b/Content.Shared/Emoting/SharedEmotingComponent.cs index d9cfbd058b..579550ebee 100644 --- a/Content.Shared/Emoting/SharedEmotingComponent.cs +++ b/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); } diff --git a/Content.Shared/Flash/SharedFlashSystem.cs b/Content.Shared/Flash/SharedFlashSystem.cs index 7ea82d2e04..0360a07ae4 100644 --- a/Content.Shared/Flash/SharedFlashSystem.cs +++ b/Content.Shared/Flash/SharedFlashSystem.cs @@ -10,14 +10,18 @@ namespace Content.Shared.Flash base.Initialize(); SubscribeLocalEvent(OnFlashableGetState); + SubscribeLocalEvent(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); } } diff --git a/Content.Shared/Friction/TileFrictionModifier.cs b/Content.Shared/Friction/TileFrictionModifier.cs index 575cae37c2..fa17802645 100644 --- a/Content.Shared/Friction/TileFrictionModifier.cs +++ b/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); } diff --git a/Content.Shared/Ghost/SharedGhostComponent.cs b/Content.Shared/Ghost/SharedGhostComponent.cs index 70169c1ee1..8e2e6c77cd 100644 --- a/Content.Shared/Ghost/SharedGhostComponent.cs +++ b/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); } diff --git a/Content.Shared/Gravity/GravityComponent.cs b/Content.Shared/Gravity/GravityComponent.cs index 3e72fe751f..3b75c14be0 100644 --- a/Content.Shared/Gravity/GravityComponent.cs +++ b/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); } diff --git a/Content.Shared/Hands/Components/HandVirtualItemComponent.cs b/Content.Shared/Hands/Components/HandVirtualItemComponent.cs index 53f3c0aa28..db42caede4 100644 --- a/Content.Shared/Hands/Components/HandVirtualItemComponent.cs +++ b/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); } diff --git a/Content.Shared/Hands/Components/SharedHandsComponent.cs b/Content.Shared/Hands/Components/SharedHandsComponent.cs index a45e358006..1aad115d26 100644 --- a/Content.Shared/Hands/Components/SharedHandsComponent.cs +++ b/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]; diff --git a/Content.Shared/Item/SharedItemComponent.cs b/Content.Shared/Item/SharedItemComponent.cs index 12ff413d18..a4ca8fe165 100644 --- a/Content.Shared/Item/SharedItemComponent.cs +++ b/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); } diff --git a/Content.Shared/MobState/Components/MobStateComponent.cs b/Content.Shared/MobState/Components/MobStateComponent.cs index fac23da4b7..be089c6e26 100644 --- a/Content.Shared/MobState/Components/MobStateComponent.cs +++ b/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); } diff --git a/Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs b/Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs index a060918822..88137fd73d 100644 --- a/Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs +++ b/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); } diff --git a/Content.Shared/Movement/Components/SharedPlayerMobMoverComponent.cs b/Content.Shared/Movement/Components/SharedPlayerMobMoverComponent.cs index 8101531d92..98c0952651 100644 --- a/Content.Shared/Movement/Components/SharedPlayerMobMoverComponent.cs +++ b/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); } diff --git a/Content.Shared/Placeable/PlaceableSurfaceComponent.cs b/Content.Shared/Placeable/PlaceableSurfaceComponent.cs index 29c378aa7b..c1bb8c9628 100644 --- a/Content.Shared/Placeable/PlaceableSurfaceComponent.cs +++ b/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); } diff --git a/Content.Shared/Pulling/Components/PullableComponent.cs b/Content.Shared/Pulling/Components/PullableComponent.cs index 6f0239ca6d..2dd4c17d20 100644 --- a/Content.Shared/Pulling/Components/PullableComponent.cs +++ b/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); } diff --git a/Content.Shared/Shuttles/Components/PilotComponent.cs b/Content.Shared/Shuttles/Components/PilotComponent.cs index 3521685492..8e3789e537 100644 --- a/Content.Shared/Shuttles/Components/PilotComponent.cs +++ b/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); } diff --git a/Content.Shared/Singularity/Components/SingularityDistortionComponent.cs b/Content.Shared/Singularity/Components/SingularityDistortionComponent.cs index e31cf8d81a..1018453317 100644 --- a/Content.Shared/Singularity/Components/SingularityDistortionComponent.cs +++ b/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); } diff --git a/Content.Shared/Slippery/SlipperyComponent.cs b/Content.Shared/Slippery/SlipperyComponent.cs index da92da0886..3d6f691069 100644 --- a/Content.Shared/Slippery/SlipperyComponent.cs +++ b/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()); } diff --git a/Content.Shared/Standing/StandingStateComponent.cs b/Content.Shared/Standing/StandingStateComponent.cs index f20afe5546..b89e44e23a 100644 --- a/Content.Shared/Standing/StandingStateComponent.cs +++ b/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); } diff --git a/Content.Shared/SubFloor/SubFloorHideComponent.cs b/Content.Shared/SubFloor/SubFloorHideComponent.cs index 100903c855..e46c492277 100644 --- a/Content.Shared/SubFloor/SubFloorHideComponent.cs +++ b/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); } diff --git a/Content.Shared/Tag/TagComponent.cs b/Content.Shared/Tag/TagComponent.cs index ba0332ec07..85dadb65e0 100644 --- a/Content.Shared/Tag/TagComponent.cs +++ b/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; diff --git a/Content.Tests/Server/GameObjects/Components/Mobs/ServerAlertsComponentTests.cs b/Content.Tests/Server/GameObjects/Components/Mobs/ServerAlertsComponentTests.cs index 6fbcebad97..e6016b1476 100644 --- a/Content.Tests/Server/GameObjects/Components/Mobs/ServerAlertsComponentTests.cs +++ b/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)); } }