diff --git a/Content.Client/Conveyor/Visualizers/ConveyorVisualizer.cs b/Content.Client/Conveyor/Visualizers/ConveyorVisualizer.cs index 7afcbe687a..b845572dc2 100644 --- a/Content.Client/Conveyor/Visualizers/ConveyorVisualizer.cs +++ b/Content.Client/Conveyor/Visualizers/ConveyorVisualizer.cs @@ -1,4 +1,4 @@ -using System; +using System; using Content.Shared.Conveyor; using JetBrains.Annotations; using Robust.Client.GameObjects; @@ -23,7 +23,7 @@ namespace Content.Client.Conveyor.Visualizers private void ChangeState(AppearanceComponent appearance) { var entities = IoCManager.Resolve(); - if (!entities.TryGetComponent(appearance.Owner, out ISpriteComponent? sprite)) + if (!entities.TryGetComponent(appearance.OwnerUid, out ISpriteComponent? sprite)) { return; } @@ -45,8 +45,8 @@ namespace Content.Client.Conveyor.Visualizers public override void InitializeEntity(EntityUid entity) { base.InitializeEntity(entity); - - var appearance = entity.EnsureComponent(); + var entities = IoCManager.Resolve(); + var appearance = entities.EnsureComponent(entity); ChangeState(appearance); } diff --git a/Content.Client/Conveyor/Visualizers/TwoWayLeverVisualizer.cs b/Content.Client/Conveyor/Visualizers/TwoWayLeverVisualizer.cs index 7006dedcc3..c36fd08ebb 100644 --- a/Content.Client/Conveyor/Visualizers/TwoWayLeverVisualizer.cs +++ b/Content.Client/Conveyor/Visualizers/TwoWayLeverVisualizer.cs @@ -22,7 +22,7 @@ namespace Content.Client.Conveyor.Visualizers private void ChangeState(AppearanceComponent appearance) { var entities = IoCManager.Resolve(); - if (!entities.TryGetComponent(appearance.Owner, out ISpriteComponent? sprite)) + if (!entities.TryGetComponent(appearance.OwnerUid, out ISpriteComponent? sprite)) { return; } @@ -44,7 +44,8 @@ namespace Content.Client.Conveyor.Visualizers { base.InitializeEntity(entity); - var appearance = entity.EnsureComponent(); + var entities = IoCManager.Resolve(); + var appearance = entities.EnsureComponent(entity); ChangeState(appearance); } diff --git a/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs b/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs index 78ff4bb4e7..d78bdfc145 100644 --- a/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs +++ b/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs @@ -71,7 +71,7 @@ namespace Content.Client.Disposal.Visualizers } var entities = IoCManager.Resolve(); - if (!entities.TryGetComponent(appearance.Owner, out ISpriteComponent? sprite)) + if (!entities.TryGetComponent(appearance.OwnerUid, out ISpriteComponent? sprite)) { return; } @@ -90,7 +90,7 @@ namespace Content.Client.Disposal.Visualizers case VisualState.Flushing: sprite.LayerSetState(DisposalUnitVisualLayers.Base, _stateAnchored); - var animPlayer = IoCManager.Resolve().GetComponent(appearance.Owner); + var animPlayer = IoCManager.Resolve().GetComponent(appearance.OwnerUid); if (!animPlayer.HasRunningAnimation(AnimationKey)) { @@ -148,9 +148,9 @@ namespace Content.Client.Disposal.Visualizers public override void InitializeEntity(EntityUid entity) { base.InitializeEntity(entity); - - entity.EnsureComponent(); - var appearance = entity.EnsureComponent(); + var entities = IoCManager.Resolve(); + entities.EnsureComponent(entity); + var appearance = entities.EnsureComponent(entity); ChangeState(appearance); } diff --git a/Content.Client/Disposal/Visualizers/DisposalVisualizer.cs b/Content.Client/Disposal/Visualizers/DisposalVisualizer.cs index a8b865982e..d8f8a03c90 100644 --- a/Content.Client/Disposal/Visualizers/DisposalVisualizer.cs +++ b/Content.Client/Disposal/Visualizers/DisposalVisualizer.cs @@ -24,7 +24,7 @@ namespace Content.Client.Disposal.Visualizers private void ChangeState(AppearanceComponent appearance) { var entities = IoCManager.Resolve(); - if (!entities.TryGetComponent(appearance.Owner, out ISpriteComponent? sprite)) + if (!entities.TryGetComponent(appearance.OwnerUid, out ISpriteComponent? sprite)) { return; } @@ -48,17 +48,17 @@ namespace Content.Client.Disposal.Visualizers { appearance.Owner.EnsureComponent(); } - else if (IoCManager.Resolve().HasComponent(appearance.Owner)) + else if (IoCManager.Resolve().HasComponent(appearance.OwnerUid)) { - IoCManager.Resolve().RemoveComponent(appearance.Owner); + IoCManager.Resolve().RemoveComponent(appearance.OwnerUid); } } public override void InitializeEntity(EntityUid entity) { base.InitializeEntity(entity); - - var appearance = entity.EnsureComponent(); + var entityManager = IoCManager.Resolve(); + var appearance = entityManager.EnsureComponent(entity); ChangeState(appearance); } diff --git a/Content.Client/Singularity/SingularityOverlay.cs b/Content.Client/Singularity/SingularityOverlay.cs index 9157e859a1..a1abd79119 100644 --- a/Content.Client/Singularity/SingularityOverlay.cs +++ b/Content.Client/Singularity/SingularityOverlay.cs @@ -76,7 +76,7 @@ namespace Content.Client.Singularity var distortions = _entityManager.EntityQuery(); foreach (var distortion in distortions) //Add all singulos that are not added yet but qualify { - var singuloEntity = distortion.Owner; + var singuloEntity = distortion.OwnerUid; if (!_singularities.Keys.Contains(singuloEntity) && SinguloQualifies(singuloEntity, currentEyeLoc)) { diff --git a/Content.Client/StationEvents/RadiationPulseOverlay.cs b/Content.Client/StationEvents/RadiationPulseOverlay.cs index a4f8f0ad15..79b22b680d 100644 --- a/Content.Client/StationEvents/RadiationPulseOverlay.cs +++ b/Content.Client/StationEvents/RadiationPulseOverlay.cs @@ -84,7 +84,7 @@ namespace Content.Client.StationEvents var pulses = _entityManager.EntityQuery(); foreach (var pulse in pulses) //Add all pulses that are not added yet but qualify { - var pulseEntity = pulse.Owner; + var pulseEntity = pulse.OwnerUid; if (!_pulses.Keys.Contains(pulseEntity) && PulseQualifies(pulseEntity, currentEyeLoc)) { diff --git a/Content.Server/Access/Systems/AccessReaderSystem.cs b/Content.Server/Access/Systems/AccessReaderSystem.cs index 0a14852427..4557d8983a 100644 --- a/Content.Server/Access/Systems/AccessReaderSystem.cs +++ b/Content.Server/Access/Systems/AccessReaderSystem.cs @@ -84,7 +84,7 @@ namespace Content.Server.Access.Systems { if (inventoryComponent.HasSlot(EquipmentSlotDefines.Slots.IDCARD) && inventoryComponent.TryGetSlotItem(EquipmentSlotDefines.Slots.IDCARD, out ItemComponent? item) && - FindAccessTagsItem(item.Owner, out tags) + FindAccessTagsItem(item.OwnerUid, out tags) ) { return tags; diff --git a/Content.Server/Advertise/AdvertiseSystem.cs b/Content.Server/Advertise/AdvertiseSystem.cs index 6bce9a8d8d..a0572699c2 100644 --- a/Content.Server/Advertise/AdvertiseSystem.cs +++ b/Content.Server/Advertise/AdvertiseSystem.cs @@ -61,7 +61,7 @@ namespace Content.Server.Advertise return; if (_prototypeManager.TryIndex(advertise.PackPrototypeId, out AdvertisementsPackPrototype? advertisements)) - _chatManager.EntitySay(advertise.Owner, Loc.GetString(_random.Pick(advertisements.Advertisements)), hideChat: true); + _chatManager.EntitySay(advertise.OwnerUid, Loc.GetString(_random.Pick(advertisements.Advertisements)), hideChat: true); if(refresh) RefreshTimer(uid, true, advertise); @@ -117,7 +117,7 @@ namespace Content.Server.Advertise if (advertise.NextAdvertisementTime > curTime) continue; - SayAdvertisement(advertise.Owner, true, advertise); + SayAdvertisement(advertise.OwnerUid, true, advertise); } } } diff --git a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs index 8765ec1fcd..f128b7437a 100644 --- a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs +++ b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs @@ -29,7 +29,7 @@ namespace Content.Server.Atmos.EntitySystems { if (airtight.FixAirBlockedDirectionInitialize) { - var rotateEvent = new RotateEvent(airtight.Owner, Angle.Zero, IoCManager.Resolve().GetComponent(airtight.Owner).WorldRotation); + var rotateEvent = new RotateEvent(airtight.OwnerUid, Angle.Zero, IoCManager.Resolve().GetComponent(airtight.Owner).WorldRotation); OnAirtightRotated(uid, airtight, ref rotateEvent); } @@ -79,7 +79,7 @@ namespace Content.Server.Atmos.EntitySystems { airtight.AirBlocked = airblocked; UpdatePosition(airtight); - RaiseLocalEvent(((IComponent) airtight).Owner, new AirtightChanged(airtight)); + RaiseLocalEvent(((IComponent) airtight).OwnerUid, new AirtightChanged(airtight)); } public void UpdatePosition(AirtightComponent airtight) diff --git a/Content.Server/Ghost/Components/GhostRadioComponent.cs b/Content.Server/Ghost/Components/GhostRadioComponent.cs index 468e33b8ea..1d064702dc 100644 --- a/Content.Server/Ghost/Components/GhostRadioComponent.cs +++ b/Content.Server/Ghost/Components/GhostRadioComponent.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Content.Server.Radio.Components; using Content.Shared.Chat; using Robust.Server.GameObjects; diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs index 2eaec30feb..cf03c09f3f 100644 --- a/Content.Server/Hands/Systems/HandsSystem.cs +++ b/Content.Server/Hands/Systems/HandsSystem.cs @@ -114,7 +114,7 @@ namespace Content.Server.Hands.Systems { var player = session?.AttachedEntity; - if (player == default) + if (!player.HasValue || !player.Value.IsValid()) return false; if (!EntityManager.TryGetComponent(player.Value, out SharedHandsComponent? hands)) @@ -189,10 +189,12 @@ namespace Content.Server.Hands.Systems if (session is not IPlayerSession playerSession) return false; - if (playerSession.AttachedEntity is not {Valid: true} playerEnt || !EntityManager.EntityExists(playerEnt)) + var player = playerSession.AttachedEntity; + + if (!player.HasValue || !player.Value.IsValid()) return false; - return EntityManager.TryGetComponent(playerEnt, out hands); + return EntityManager.TryGetComponent(player.Value, out hands); } private void HandleActivateItem(ICommonSession? session) @@ -216,12 +218,15 @@ namespace Content.Server.Hands.Systems if (session is not IPlayerSession playerSession) return false; - if (playerSession.AttachedEntity is not {Valid: true} playerEnt || - !EntityManager.EntityExists(playerEnt) || - playerEnt.IsInContainer() || - !EntityManager.TryGetComponent(playerEnt, out SharedHandsComponent? hands) || + var maybePlayer = playerSession.AttachedEntity; + if (!maybePlayer.HasValue) return false; + var player = maybePlayer.Value; + + if (!EntityManager.EntityExists(player) || + player.IsInContainer() || + !EntityManager.TryGetComponent(player, out SharedHandsComponent? hands) || !hands.TryGetActiveHeldEntity(out var throwEnt) || - !_actionBlockerSystem.CanThrow(playerEnt)) + !_actionBlockerSystem.CanThrow(player)) return false; if (EntityManager.TryGetComponent(throwEnt, out StackComponent? stack) && stack.Count > 1 && stack.ThrowIndividually) @@ -271,7 +276,7 @@ namespace Content.Server.Hands.Systems return; if (!inventory.TryGetSlotItem(equipmentSlot, out ItemComponent? equipmentItem) || - !EntityManager.TryGetComponent(equipmentItem.Owner, out ServerStorageComponent? storageComponent)) + !EntityManager.TryGetComponent(equipmentItem.OwnerUid, out ServerStorageComponent? storageComponent)) { plyEnt.PopupMessage(Loc.GetString("hands-system-missing-equipment-slot", ("slotName", SlotNames[equipmentSlot].ToLower()))); return; diff --git a/Content.Server/Headset/HeadsetComponent.cs b/Content.Server/Headset/HeadsetComponent.cs index 92970f1e6c..2e3232ec84 100644 --- a/Content.Server/Headset/HeadsetComponent.cs +++ b/Content.Server/Headset/HeadsetComponent.cs @@ -59,7 +59,7 @@ namespace Content.Server.Headset { if (Owner.TryGetContainer(out var container)) { - if (!IoCManager.Resolve().TryGetComponent(container.Owner, out ActorComponent? actor)) + if (!IoCManager.Resolve().TryGetComponent(container.OwnerUid, out ActorComponent? actor)) return; var playerChannel = actor.PlayerSession.ConnectedClient; diff --git a/Content.Server/Radio/Components/HandheldRadioComponent.cs b/Content.Server/Radio/Components/HandheldRadioComponent.cs index df8e354ffb..f05181d5b4 100644 --- a/Content.Server/Radio/Components/HandheldRadioComponent.cs +++ b/Content.Server/Radio/Components/HandheldRadioComponent.cs @@ -79,13 +79,13 @@ namespace Content.Server.Radio.Components return Use(eventArgs.User); } - public bool CanListen(string message, EntityUidsource) + public bool CanListen(string message, EntityUid source) { return RadioOn && Owner.InRangeUnobstructed(IoCManager.Resolve().GetComponent(source).Coordinates, range: ListenRange); } - public void Receive(string message, int channel, EntityUidspeaker) + public void Receive(string message, int channel, EntityUid speaker) { if (RadioOn) { @@ -93,12 +93,12 @@ namespace Content.Server.Radio.Components } } - public void Listen(string message, EntityUidspeaker) + public void Listen(string message, EntityUid speaker) { Broadcast(message, speaker); } - public void Broadcast(string message, EntityUidspeaker) + public void Broadcast(string message, EntityUid speaker) { _radioSystem.SpreadMessage(this, speaker, message, BroadcastFrequency); } diff --git a/Content.Server/Radio/Components/IListen.cs b/Content.Server/Radio/Components/IListen.cs index f5cbe090f5..daeb227d3b 100644 --- a/Content.Server/Radio/Components/IListen.cs +++ b/Content.Server/Radio/Components/IListen.cs @@ -1,4 +1,4 @@ -using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects; namespace Content.Server.Radio.Components { diff --git a/Content.Server/Radio/Components/IRadio.cs b/Content.Server/Radio/Components/IRadio.cs index 85897fa566..4025956762 100644 --- a/Content.Server/Radio/Components/IRadio.cs +++ b/Content.Server/Radio/Components/IRadio.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using Robust.Shared.GameObjects; +using System.Collections.Generic; using Robust.Shared.GameObjects; namespace Content.Server.Radio.Components diff --git a/Content.Server/Sandbox/SandboxManager.cs b/Content.Server/Sandbox/SandboxManager.cs index af319fbb14..4f4bcf05c4 100644 --- a/Content.Server/Sandbox/SandboxManager.cs +++ b/Content.Server/Sandbox/SandboxManager.cs @@ -157,7 +157,7 @@ namespace Content.Server.Sandbox } } - void UpgradeId(EntityUidid) + void UpgradeId(EntityUid id) { var accessSystem = EntitySystem.Get(); accessSystem.TrySetTags(id, allAccess); diff --git a/Content.Server/Shuttles/EntitySystems/DockingSystem.cs b/Content.Server/Shuttles/EntitySystems/DockingSystem.cs index ff94f88fe2..2441ce8c75 100644 --- a/Content.Server/Shuttles/EntitySystems/DockingSystem.cs +++ b/Content.Server/Shuttles/EntitySystems/DockingSystem.cs @@ -110,7 +110,7 @@ namespace Content.Server.Shuttles.EntitySystems if (dockingFixture == null) { DebugTools.Assert(false); - Logger.ErrorS("docking", $"Found null fixture on {((IComponent) body).Owner)}" + Logger.ErrorS("docking", $"Found null fixture on {((IComponent) body).OwnerUid}"); return null; } @@ -144,7 +144,7 @@ namespace Content.Server.Shuttles.EntitySystems if (otherDockingFixture == null) { DebugTools.Assert(false); - Logger.ErrorS("docking", $"Found null docking fixture on {ent)}" + Logger.ErrorS("docking", $"Found null docking fixture on {ent}"); continue; } @@ -200,8 +200,8 @@ namespace Content.Server.Shuttles.EntitySystems dockA.DockedWith = null; // If these grids are ever invalid then need to look at fixing ordering for unanchored events elsewhere. - var gridAUid = _mapManager.GetGrid(EntityManager.GetComponent(((IComponent) dockA).Owner).GridID).GridEntityId; - var gridBUid = _mapManager.GetGrid(EntityManager.GetComponent(((IComponent) dockB).Owner).GridID).GridEntityId; + var gridAUid = _mapManager.GetGrid(EntityManager.GetComponent(((IComponent) dockA).OwnerUid).GridID).GridEntityId; + var gridBUid = _mapManager.GetGrid(EntityManager.GetComponent(((IComponent) dockB).OwnerUid).GridID).GridEntityId; var msg = new UndockEvent { @@ -211,8 +211,8 @@ namespace Content.Server.Shuttles.EntitySystems GridBUid = gridBUid, }; - EntityManager.EventBus.RaiseLocalEvent(((IComponent) dockA).Owner, msg, false); - EntityManager.EventBus.RaiseLocalEvent(((IComponent) dockB).Owner, msg, false); + EntityManager.EventBus.RaiseLocalEvent(((IComponent) dockA).OwnerUid, msg, false); + EntityManager.EventBus.RaiseLocalEvent(((IComponent) dockB).OwnerUid, msg, false); EntityManager.EventBus.RaiseEvent(EventSource.Local, msg); } @@ -308,8 +308,8 @@ namespace Content.Server.Shuttles.EntitySystems // We could also potentially use a prismatic joint? Depending if we want clamps that can extend or whatever - var dockAXform = EntityManager.GetComponent(((IComponent) dockA).Owner); - var dockBXform = EntityManager.GetComponent(((IComponent) dockB).Owner); + var dockAXform = EntityManager.GetComponent(((IComponent) dockA).OwnerUid); + var dockBXform = EntityManager.GetComponent(((IComponent) dockB).OwnerUid); var gridA = _mapManager.GetGrid(dockAXform.GridID).GridEntityId; var gridB = _mapManager.GetGrid(dockBXform.GridID).GridEntityId; @@ -344,13 +344,13 @@ namespace Content.Server.Shuttles.EntitySystems dockA.DockJoint = joint; dockB.DockJoint = joint; - if (EntityManager.TryGetComponent(((IComponent) dockA).Owner, out ServerDoorComponent? doorA)) + if (EntityManager.TryGetComponent(((IComponent) dockA).OwnerUid, out ServerDoorComponent? doorA)) { doorA.ChangeAirtight = false; doorA.Open(); } - if (EntityManager.TryGetComponent(((IComponent) dockB).Owner, out ServerDoorComponent? doorB)) + if (EntityManager.TryGetComponent(((IComponent) dockB).OwnerUid, out ServerDoorComponent? doorB)) { doorB.ChangeAirtight = false; doorB.Open(); @@ -364,8 +364,8 @@ namespace Content.Server.Shuttles.EntitySystems GridBUid = gridB, }; - EntityManager.EventBus.RaiseLocalEvent(((IComponent) dockA).Owner, msg, false); - EntityManager.EventBus.RaiseLocalEvent(((IComponent) dockB).Owner, msg, false); + EntityManager.EventBus.RaiseLocalEvent(((IComponent) dockA).OwnerUid, msg, false); + EntityManager.EventBus.RaiseLocalEvent(((IComponent) dockB).OwnerUid, msg, false); EntityManager.EventBus.RaiseEvent(EventSource.Local, msg); } @@ -374,8 +374,8 @@ namespace Content.Server.Shuttles.EntitySystems /// private void TryDock(DockingComponent dockA, DockingComponent dockB) { - if (!EntityManager.TryGetComponent(((IComponent) dockA).Owner, out PhysicsComponent? bodyA) || - !EntityManager.TryGetComponent(((IComponent) dockB).Owner, out PhysicsComponent? bodyB) || + if (!EntityManager.TryGetComponent(((IComponent) dockA).OwnerUid, out PhysicsComponent? bodyA) || + !EntityManager.TryGetComponent(((IComponent) dockB).OwnerUid, out PhysicsComponent? bodyB) || !dockA.Enabled || !dockB.Enabled) { @@ -425,13 +425,13 @@ namespace Content.Server.Shuttles.EntitySystems return; } - if (EntityManager.TryGetComponent(((IComponent) dock).Owner, out ServerDoorComponent? doorA)) + if (EntityManager.TryGetComponent(((IComponent) dock).OwnerUid, out ServerDoorComponent? doorA)) { doorA.ChangeAirtight = true; doorA.Close(); } - if (EntityManager.TryGetComponent(((IComponent) dock.DockedWith).Owner, out ServerDoorComponent? doorB)) + if (EntityManager.TryGetComponent(((IComponent) dock.DockedWith).OwnerUid, out ServerDoorComponent? doorB)) { doorB.ChangeAirtight = true; doorB.Close(); diff --git a/Content.Server/Shuttles/EntitySystems/ShuttleSystem.cs b/Content.Server/Shuttles/EntitySystems/ShuttleSystem.cs index 98d1c9c9cf..646e2e0646 100644 --- a/Content.Server/Shuttles/EntitySystems/ShuttleSystem.cs +++ b/Content.Server/Shuttles/EntitySystems/ShuttleSystem.cs @@ -52,7 +52,7 @@ namespace Content.Server.Shuttles.EntitySystems private void OnGridInit(GridInitializeEvent ev) { - ev.EntityUid).EnsureComponent( + EntityManager.EnsureComponent(ev.EntityUid); } private void OnShuttleStartup(EntityUid uid, ShuttleComponent component, ComponentStartup args) diff --git a/Content.Server/Singularity/Components/ContainmentFieldConnection.cs b/Content.Server/Singularity/Components/ContainmentFieldConnection.cs index 0f6f586c4e..f2f6a26eae 100644 --- a/Content.Server/Singularity/Components/ContainmentFieldConnection.cs +++ b/Content.Server/Singularity/Components/ContainmentFieldConnection.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Threading; using Robust.Shared.GameObjects; @@ -71,7 +71,7 @@ namespace Content.Server.Singularity.Components Timer.SpawnRepeating(1000, () => { SharedEnergyPool--;}, _powerDecreaseCancellationTokenSource.Token); } - public bool CanRepell(EntityUidtoRepell) + public bool CanRepell(EntityUid toRepell) { var powerNeeded = 1; if (IoCManager.Resolve().TryGetComponent(toRepell, out var singularityComponent)) diff --git a/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs b/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs index d8d1f5113f..dd7c353cc8 100644 --- a/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs +++ b/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs @@ -62,7 +62,7 @@ namespace Content.Server.Singularity.Components private Tuple? _connection1; private Tuple? _connection2; - public bool CanRepell(EntityUidtoRepell) => _connection1?.Item2?.CanRepell(toRepell) == true || + public bool CanRepell(EntityUid toRepell) => _connection1?.Item2?.CanRepell(toRepell) == true || _connection2?.Item2?.CanRepell(toRepell) == true; public void OnAnchoredChanged() diff --git a/Content.Server/Tabletop/TabletopChessSetup.cs b/Content.Server/Tabletop/TabletopChessSetup.cs index d77d218391..55b34b4a73 100644 --- a/Content.Server/Tabletop/TabletopChessSetup.cs +++ b/Content.Server/Tabletop/TabletopChessSetup.cs @@ -35,9 +35,9 @@ namespace Content.Server.Tabletop SpawnPiecesRow(session, entityManager, "White", new MapCoordinates(x, y - 7 * separation, mapId), separation); // Extra queens - EntityUidtempQualifier = entityManager.SpawnEntity("BlackQueen", new MapCoordinates(x + 9 * separation + 9f / 32, y - 3 * separation, mapId)); + EntityUid tempQualifier = entityManager.SpawnEntity("BlackQueen", new MapCoordinates(x + 9 * separation + 9f / 32, y - 3 * separation, mapId)); session.Entities.Add(tempQualifier); - EntityUidtempQualifier1 = entityManager.SpawnEntity("WhiteQueen", new MapCoordinates(x + 9 * separation + 9f / 32, y - 4 * separation, mapId)); + EntityUid tempQualifier1 = entityManager.SpawnEntity("WhiteQueen", new MapCoordinates(x + 9 * separation + 9f / 32, y - 4 * separation, mapId)); session.Entities.Add(tempQualifier1); } @@ -53,23 +53,23 @@ namespace Content.Server.Tabletop switch (piecesRow[i]) { case 'r': - EntityUidtempQualifier = entityManager.SpawnEntity(color + "Rook", new MapCoordinates(x + i * separation, y, mapId)); + EntityUid tempQualifier = entityManager.SpawnEntity(color + "Rook", new MapCoordinates(x + i * separation, y, mapId)); session.Entities.Add(tempQualifier); break; case 'n': - EntityUidtempQualifier1 = entityManager.SpawnEntity(color + "Knight", new MapCoordinates(x + i * separation, y, mapId)); + EntityUid tempQualifier1 = entityManager.SpawnEntity(color + "Knight", new MapCoordinates(x + i * separation, y, mapId)); session.Entities.Add(tempQualifier1); break; case 'b': - EntityUidtempQualifier2 = entityManager.SpawnEntity(color + "Bishop", new MapCoordinates(x + i * separation, y, mapId)); + EntityUid tempQualifier2 = entityManager.SpawnEntity(color + "Bishop", new MapCoordinates(x + i * separation, y, mapId)); session.Entities.Add(tempQualifier2); break; case 'q': - EntityUidtempQualifier3 = entityManager.SpawnEntity(color + "Queen", new MapCoordinates(x + i * separation, y, mapId)); + EntityUid tempQualifier3 = entityManager.SpawnEntity(color + "Queen", new MapCoordinates(x + i * separation, y, mapId)); session.Entities.Add(tempQualifier3); break; case 'k': - EntityUidtempQualifier4 = entityManager.SpawnEntity(color + "King", new MapCoordinates(x + i * separation, y, mapId)); + EntityUid tempQualifier4 = entityManager.SpawnEntity(color + "King", new MapCoordinates(x + i * separation, y, mapId)); session.Entities.Add(tempQualifier4); break; } @@ -83,7 +83,7 @@ namespace Content.Server.Tabletop for (int i = 0; i < 8; i++) { - EntityUidtempQualifier = entityManager.SpawnEntity(color + "Pawn", new MapCoordinates(x + i * separation, y, mapId)); + EntityUid tempQualifier = entityManager.SpawnEntity(color + "Pawn", new MapCoordinates(x + i * separation, y, mapId)); session.Entities.Add(tempQualifier); } } diff --git a/Content.Server/Tabletop/TabletopParchisSetup.cs b/Content.Server/Tabletop/TabletopParchisSetup.cs index a5f69fdd58..38b6f5a5d2 100644 --- a/Content.Server/Tabletop/TabletopParchisSetup.cs +++ b/Content.Server/Tabletop/TabletopParchisSetup.cs @@ -35,43 +35,43 @@ namespace Content.Server.Tabletop var center = session.Position; // Red pieces. - EntityUidtempQualifier = entityManager.SpawnEntity(RedPiecePrototype, center.Offset(-x1, -y1)); + EntityUid tempQualifier = entityManager.SpawnEntity(RedPiecePrototype, center.Offset(-x1, -y1)); session.Entities.Add(tempQualifier); - EntityUidtempQualifier1 = entityManager.SpawnEntity(RedPiecePrototype, center.Offset(-x1, -y2)); + EntityUid tempQualifier1 = entityManager.SpawnEntity(RedPiecePrototype, center.Offset(-x1, -y2)); session.Entities.Add(tempQualifier1); - EntityUidtempQualifier2 = entityManager.SpawnEntity(RedPiecePrototype, center.Offset(-x2, -y1)); + EntityUid tempQualifier2 = entityManager.SpawnEntity(RedPiecePrototype, center.Offset(-x2, -y1)); session.Entities.Add(tempQualifier2); - EntityUidtempQualifier3 = entityManager.SpawnEntity(RedPiecePrototype, center.Offset(-x2, -y2)); + EntityUid tempQualifier3 = entityManager.SpawnEntity(RedPiecePrototype, center.Offset(-x2, -y2)); session.Entities.Add(tempQualifier3); // Green pieces. - EntityUidtempQualifier4 = entityManager.SpawnEntity(GreenPiecePrototype, center.Offset(x1, -y1)); + EntityUid tempQualifier4 = entityManager.SpawnEntity(GreenPiecePrototype, center.Offset(x1, -y1)); session.Entities.Add(tempQualifier4); - EntityUidtempQualifier5 = entityManager.SpawnEntity(GreenPiecePrototype, center.Offset(x1, -y2)); + EntityUid tempQualifier5 = entityManager.SpawnEntity(GreenPiecePrototype, center.Offset(x1, -y2)); session.Entities.Add(tempQualifier5); - EntityUidtempQualifier6 = entityManager.SpawnEntity(GreenPiecePrototype, center.Offset(x2, -y1)); + EntityUid tempQualifier6 = entityManager.SpawnEntity(GreenPiecePrototype, center.Offset(x2, -y1)); session.Entities.Add(tempQualifier6); - EntityUidtempQualifier7 = entityManager.SpawnEntity(GreenPiecePrototype, center.Offset(x2, -y2)); + EntityUid tempQualifier7 = entityManager.SpawnEntity(GreenPiecePrototype, center.Offset(x2, -y2)); session.Entities.Add(tempQualifier7); // Yellow pieces. - EntityUidtempQualifier8 = entityManager.SpawnEntity(YellowPiecePrototype, center.Offset(x1, y1)); + EntityUid tempQualifier8 = entityManager.SpawnEntity(YellowPiecePrototype, center.Offset(x1, y1)); session.Entities.Add(tempQualifier8); - EntityUidtempQualifier9 = entityManager.SpawnEntity(YellowPiecePrototype, center.Offset(x1, y2)); + EntityUid tempQualifier9 = entityManager.SpawnEntity(YellowPiecePrototype, center.Offset(x1, y2)); session.Entities.Add(tempQualifier9); - EntityUidtempQualifier10 = entityManager.SpawnEntity(YellowPiecePrototype, center.Offset(x2, y1)); + EntityUid tempQualifier10 = entityManager.SpawnEntity(YellowPiecePrototype, center.Offset(x2, y1)); session.Entities.Add(tempQualifier10); - EntityUidtempQualifier11 = entityManager.SpawnEntity(YellowPiecePrototype, center.Offset(x2, y2)); + EntityUid tempQualifier11 = entityManager.SpawnEntity(YellowPiecePrototype, center.Offset(x2, y2)); session.Entities.Add(tempQualifier11); // Blue pieces. - EntityUidtempQualifier12 = entityManager.SpawnEntity(BluePiecePrototype, center.Offset(-x1, y1)); + EntityUid tempQualifier12 = entityManager.SpawnEntity(BluePiecePrototype, center.Offset(-x1, y1)); session.Entities.Add(tempQualifier12); - EntityUidtempQualifier13 = entityManager.SpawnEntity(BluePiecePrototype, center.Offset(-x1, y2)); + EntityUid tempQualifier13 = entityManager.SpawnEntity(BluePiecePrototype, center.Offset(-x1, y2)); session.Entities.Add(tempQualifier13); - EntityUidtempQualifier14 = entityManager.SpawnEntity(BluePiecePrototype, center.Offset(-x2, y1)); + EntityUid tempQualifier14 = entityManager.SpawnEntity(BluePiecePrototype, center.Offset(-x2, y1)); session.Entities.Add(tempQualifier14); - EntityUidtempQualifier15 = entityManager.SpawnEntity(BluePiecePrototype, center.Offset(-x2, y2)); + EntityUid tempQualifier15 = entityManager.SpawnEntity(BluePiecePrototype, center.Offset(-x2, y2)); session.Entities.Add(tempQualifier15); } } diff --git a/Content.Server/UserInterface/ActivatableUISystem.cs b/Content.Server/UserInterface/ActivatableUISystem.cs index 4e94b78b30..3d50e6c414 100644 --- a/Content.Server/UserInterface/ActivatableUISystem.cs +++ b/Content.Server/UserInterface/ActivatableUISystem.cs @@ -133,8 +133,8 @@ namespace Content.Server.UserInterface public class ActivatableUIOpenAttemptEvent : CancellableEntityEventArgs { - public EntityUid user { get; } - public ActivatableUIOpenAttemptEvent(EntityUidwho) + public EntityUid User { get; } + public ActivatableUIOpenAttemptEvent(EntityUid who) { User = who; } diff --git a/Content.Server/Verbs/Commands/InvokeVerbCommand.cs b/Content.Server/Verbs/Commands/InvokeVerbCommand.cs index a97905be3f..bf31e5ab89 100644 --- a/Content.Server/Verbs/Commands/InvokeVerbCommand.cs +++ b/Content.Server/Verbs/Commands/InvokeVerbCommand.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using Content.Server.Administration; using Content.Shared.Administration; @@ -29,12 +29,12 @@ namespace Content.Server.Verbs.Commands var verbSystem = EntitySystem.Get(); // get the 'player' entity (defaulting to command user, otherwise uses a uid) - EntityUid playerEntity = null; + EntityUid playerEntity = default; if (!int.TryParse(args[0], out var intPlayerUid)) { if (args[0] == "self" && shell.Player?.AttachedEntity != null) { - playerEntity = shell.Player.AttachedEntity; + playerEntity = shell.Player.AttachedEntityUid.Value; } else { @@ -54,14 +54,14 @@ namespace Content.Server.Verbs.Commands return; } - if (playerEntity == null) + if (playerEntity == default) { shell.WriteError(Loc.GetString("invoke-verb-command-invalid-player-entity")); return; } var entUid = new EntityUid(intUid); - if (!entityManager.EntityExists(entUid) + if (!entityManager.EntityExists(entUid)) { shell.WriteError(Loc.GetString("invoke-verb-command-invalid-target-entity")); return; diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs index e809b03a54..522a256c9f 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs @@ -384,7 +384,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components return false; } - public void InsertMagazine(EntityUid user, EntityUidmagazine) + public void InsertMagazine(EntityUid user, EntityUid magazine) { SoundSystem.Play(Filter.Pvs(Owner), _soundMagInsert.GetSound(), Owner, AudioParams.Default.WithVolume(-2)); Owner.PopupMessage(user, Loc.GetString("server-magazine-barrel-component-interact-using-success"));