space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Inline TryGetComponent completely, for real

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 14:17:01 +01:00
parent 9739eaa34a
commit e93ae73e50
28 changed files with 64 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Robust.Client/GameObjects/EntitySystems/ClientOccluderSystem.cs
View File

@@ -71,7 +71,7 @@ namespace Robust.Client.GameObjects
{
var sender = ev.Sender;
if (IoCManager.Resolve<IEntityManager>().EntityExists(sender.Uid) &&
sender.TryGetComponent(out ClientOccluderComponent? iconSmooth)
IoCManager.Resolve<IEntityManager>().TryGetComponent(sender.Uid, out ClientOccluderComponent? iconSmooth)
&& iconSmooth.Running)
{
var grid1 = _mapManager.GetGrid(sender.Transform.GridID);

4
Robust.Client/GameObjects/EntitySystems/ContainerSystem.cs
View File

@@ -198,7 +198,7 @@ namespace Robust.Client.GameObjects
private static void UpdateEntity(IEntity entity)
{
if (entity.TryGetComponent(out SpriteComponent? sprite))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out SpriteComponent? sprite))
{
sprite.ContainerOccluded = false;
@@ -216,7 +216,7 @@ namespace Robust.Client.GameObjects
}
}
if (entity.TryGetComponent(out PointLightComponent? light))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out PointLightComponent? light))
{
light.ContainerOccluded = false;

2
Robust.Client/GameObjects/EntitySystems/InputSystem.cs
View File

@@ -123,7 +123,7 @@ namespace Robust.Client.GameObjects
if(entity == null || !IoCManager.Resolve<IEntityManager>().EntityExists(entity.Uid))
throw new ArgumentNullException(nameof(entity));
if (!entity.TryGetComponent(out InputComponent? inputComp))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out InputComponent? inputComp))
{
Logger.DebugS("input.context", $"AttachedEnt has no InputComponent: entId={entity.Uid}, entProto={IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityPrototype}. Setting default \"{InputContextContainer.DefaultContextName}\" context...");
inputMan.Contexts.SetActiveContext(InputContextContainer.DefaultContextName);

6
Robust.Client/GameObjects/EntitySystems/RenderingTreeSystem.cs
View File

@@ -123,10 +123,10 @@ namespace Robust.Client.GameObjects
// WHATEVER YOU DO, DON'T REPLACE THIS WITH SPAMMING EVENTS UNLESS YOU HAVE A GUARANTEE IT WON'T LAG THE GC.
// (Struct-based events ok though)
// Ironically this was lagging the GC lolz
if (sender.Owner.TryGetComponent(out SpriteComponent? sprite))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(sender.Owner.Uid, out SpriteComponent? sprite))
QueueSpriteUpdate(sprite);
if (sender.Owner.TryGetComponent(out PointLightComponent? light))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(sender.Owner.Uid, out PointLightComponent? light))
QueueLightUpdate(light);
foreach (TransformComponent child in sender.Children)
@@ -260,7 +260,7 @@ namespace Robust.Client.GameObjects
{
if (parent == null) break;
if (parent.TryGetComponent(out RenderingTreeComponent? comp)) return comp;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(parent.Uid, out RenderingTreeComponent? comp)) return comp;
parent = parent.Transform.Parent?.Owner;
}

2
Robust.Client/GameObjects/EntitySystems/VelocityDebugSystem.cs
View File

@@ -35,7 +35,7 @@ namespace Robust.Client.GameObjects
var player = _playerManager.LocalPlayer?.ControlledEntity;
if (player == null || !player.TryGetComponent(out PhysicsComponent? body))
if (player == null || !IoCManager.Resolve<IEntityManager>().TryGetComponent(player.Uid, out PhysicsComponent? body))
{
_label.Visible = false;
return;

2
Robust.Client/Placement/Modes/AlignSimilar.cs
View File

@@ -42,7 +42,7 @@ namespace Robust.Client.Placement.Modes
}
var closestEntity = snapToEntities[0];
if (!closestEntity.TryGetComponent<ISpriteComponent>(out var component) || component.BaseRSI == null)
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<ISpriteComponent?>(closestEntity.Uid, out var component) || component.BaseRSI == null)
{
return;
}

2
Robust.Client/ViewVariables/Instances/ViewVariablesInstanceEntity.cs
View File

@@ -108,7 +108,7 @@ namespace Robust.Client.ViewVariables.Instances
top = new Label {Text = stringified};
}
if (_entity.TryGetComponent(out ISpriteComponent? sprite))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(_entity.Uid, out ISpriteComponent? sprite))
{
var hBox = new BoxContainer
{

4
Robust.Server/Maps/MapLoader.cs
View File

@@ -508,7 +508,7 @@ namespace Robust.Server.Maps
var pvs = EntitySystem.Get<PVSSystem>();
foreach (var entity in Entities)
{
if (entity.TryGetComponent(out IMapGridComponent? grid))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out IMapGridComponent? grid))
{
var castGrid = (MapGrid) grid.Grid;
castGrid.GridEntityId = entity.Uid;
@@ -734,7 +734,7 @@ namespace Robust.Server.Maps
if (IsMapSavable(entity))
{
Entities.Add(entity);
if (entity.TryGetComponent(out MapSaveIdComponent? mapSaveId))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out MapSaveIdComponent? mapSaveId))
{
withUid.Add(mapSaveId);
}

6
Robust.Server/Placement/PlacementManager.cs
View File

@@ -223,7 +223,7 @@ namespace Robust.Server.Placement
/// </summary>
public void SendPlacementBegin(IEntity mob, int range, string objectType, string alignOption)
{
if (!mob.TryGetComponent<ActorComponent>(out var actor))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<ActorComponent?>(mob.Uid, out var actor))
return;
var playerConnection = actor.PlayerSession.ConnectedClient;
@@ -244,7 +244,7 @@ namespace Robust.Server.Placement
/// </summary>
public void SendPlacementBeginTile(IEntity mob, int range, string tileType, string alignOption)
{
if (!mob.TryGetComponent<ActorComponent>(out var actor))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<ActorComponent?>(mob.Uid, out var actor))
return;
var playerConnection = actor.PlayerSession.ConnectedClient;
@@ -265,7 +265,7 @@ namespace Robust.Server.Placement
/// </summary>
public void SendPlacementCancel(IEntity mob)
{
if (!mob.TryGetComponent<ActorComponent>(out var actor))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<ActorComponent?>(mob.Uid, out var actor))
return;
var playerConnection = actor.PlayerSession.ConnectedClient;

4
Robust.Shared/Containers/ContainerHelpers.cs
View File

@@ -170,7 +170,7 @@ namespace Robust.Shared.Containers
DebugTools.AssertNotNull(entity);
DebugTools.Assert(!((!IoCManager.Resolve<IEntityManager>().EntityExists(entity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityLifeStage) >= EntityLifeStage.Deleted));
if (entity.TryGetComponent(out manager))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out manager))
return true;
// RECURSION ALERT
@@ -272,7 +272,7 @@ namespace Robust.Shared.Containers
public static T CreateContainer<T>(this IEntity entity, string containerId)
where T : IContainer
{
if (!entity.TryGetComponent<IContainerManager>(out var containermanager))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<IContainerManager?>(entity.Uid, out var containermanager))
containermanager = IoCManager.Resolve<IEntityManager>().AddComponent<ContainerManagerComponent>(entity);
return containermanager.MakeContainer<T>(containerId);

2
Robust.Shared/Containers/SharedContainerSystem.cs
View File

@@ -133,7 +133,7 @@ namespace Robust.Shared.Containers
if (oldParentEntity == null || !IoCManager.Resolve<IEntityManager>().EntityExists(oldParentEntity.Uid))
return;
if (oldParentEntity.TryGetComponent(out IContainerManager? containerManager))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(oldParentEntity.Uid, out IContainerManager? containerManager))
containerManager.ForceRemove(message.Entity);
}
}

10
Robust.Shared/GameObjects/ComponentExt.cs
View File

@@ -18,7 +18,8 @@ namespace Robust.Shared.GameObjects
/// <returns>True if the component already existed, false if it had to be created.</returns>
public static bool EnsureComponent<T>(this IEntity entity, out T component) where T : Component, new()
{
if (entity.TryGetComponent(out component!))
ref T? comp = ref component!;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out comp))
{
return true;
}
@@ -36,7 +37,7 @@ namespace Robust.Shared.GameObjects
/// <returns>The existing component, or the new component if none existed yet.</returns>
public static T EnsureComponent<T>(this IEntity entity) where T : Component, new()
{
if (entity.TryGetComponent(out T? component))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out T? component))
{
return component;
}
@@ -58,7 +59,8 @@ namespace Robust.Shared.GameObjects
/// <returns>True if the component already existed, false if it had to be created.</returns>
public static bool EnsureComponentWarn<T>(this IEntity entity, out T component, string? warning = null) where T : Component, new()
{
if (entity.TryGetComponent(out component!))
ref T? comp = ref component!;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out comp))
{
return true;
}
@@ -84,7 +86,7 @@ namespace Robust.Shared.GameObjects
/// <returns>The existing component, or the new component if none existed yet.</returns>
public static T EnsureComponentWarn<T>(this IEntity entity, string? warning = null) where T : Component, new()
{
if (entity.TryGetComponent(out T? component))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out T? component))
{
return component;
}

10
Robust.Shared/GameObjects/Components/Collidable/PhysicsComponent.Physics.cs
View File

@@ -568,7 +568,7 @@ namespace Robust.Shared.GameObjects
while (parent != null)
{
if (parent.TryGetComponent(out PhysicsComponent? body))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(parent.Uid, out PhysicsComponent? body))
{
linearVelocity += body.LinearVelocity;
angularVelocity += body.AngularVelocity;
@@ -624,7 +624,7 @@ namespace Robust.Shared.GameObjects
while (parent != null)
{
if (parent.TryGetComponent(out PhysicsComponent? body))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(parent.Uid, out PhysicsComponent? body))
{
velocity += body.LinearVelocity;
}
@@ -679,7 +679,7 @@ namespace Robust.Shared.GameObjects
while (parent != null)
{
if (parent.TryGetComponent(out PhysicsComponent? body))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(parent.Uid, out PhysicsComponent? body))
{
velocity += body.AngularVelocity;
}
@@ -974,8 +974,8 @@ namespace Robust.Shared.GameObjects
// Does a joint prevent collision?
// if one of them doesn't have jointcomp then they can't share a common joint.
// otherwise, only need to iterate over the joints of one component as they both store the same joint.
if (Owner.TryGetComponent(out JointComponent? jointComponentA) &&
other.Owner.TryGetComponent(out JointComponent? jointComponentB))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner.Uid, out JointComponent? jointComponentA) &&
IoCManager.Resolve<IEntityManager>().TryGetComponent(other.Owner.Uid, out JointComponent? jointComponentB))
{
var aUid = jointComponentA.Owner.Uid;
var bUid = jointComponentB.Owner.Uid;

2
Robust.Shared/GameObjects/Components/CollisionWakeComponent.cs
View File

@@ -43,7 +43,7 @@ namespace Robust.Shared.GameObjects
protected override void OnRemove()
{
base.OnRemove();
if (Owner.TryGetComponent(out IPhysBody? body) && (!IoCManager.Resolve<IEntityManager>().EntityExists(Owner.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner.Uid).EntityLifeStage) < EntityLifeStage.Terminating)
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner.Uid, out IPhysBody? body) && (!IoCManager.Resolve<IEntityManager>().EntityExists(Owner.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner.Uid).EntityLifeStage) < EntityLifeStage.Terminating)
{
body.CanCollide = true;
}

4
Robust.Shared/GameObjects/Components/Map/MapGridComponent.cs
View File

@@ -83,7 +83,7 @@ namespace Robust.Shared.GameObjects
xform.SetAnchored(result);
if (xform.Owner.TryGetComponent<PhysicsComponent>(out var physicsComponent))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<PhysicsComponent?>(xform.Owner.Uid, out var physicsComponent))
{
physicsComponent.BodyType = BodyType.Static;
}
@@ -104,7 +104,7 @@ namespace Robust.Shared.GameObjects
var tileIndices = Grid.TileIndicesFor(transform.Coordinates);
Grid.RemoveFromSnapGridCell(tileIndices, transform.OwnerUid);
xform.SetAnchored(false);
if (xform.Owner.TryGetComponent<PhysicsComponent>(out var physicsComponent))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<PhysicsComponent?>(xform.Owner.Uid, out var physicsComponent))
{
physicsComponent.BodyType = BodyType.Dynamic;
}

4
Robust.Shared/GameObjects/Components/Transform/TransformComponent.cs
View File

@@ -511,7 +511,7 @@ namespace Robust.Shared.GameObjects
else
{
// second level node, terminates recursion up the branch of the tree
if (p.Owner.TryGetComponent(out IMapComponent? mapComp))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(p.Owner.Uid, out IMapComponent? mapComp))
{
value = mapComp.WorldMap;
}
@@ -551,7 +551,7 @@ namespace Robust.Shared.GameObjects
return GridId.Invalid;
}
if (Owner.TryGetComponent(out IMapGridComponent? gridComponent))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner.Uid, out IMapGridComponent? gridComponent))
{
return gridComponent.GridIndex;
}

6
Robust.Shared/GameObjects/Systems/EntityLookup.cs
View File

@@ -589,7 +589,7 @@ namespace Robust.Shared.GameObjects
private bool Intersecting(IEntity entity, Vector2 mapPosition)
{
if (entity.TryGetComponent(out IPhysBody? component))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out IPhysBody? component))
{
if (component.GetWorldAABB().Contains(mapPosition))
return true;
@@ -749,7 +749,7 @@ namespace Robust.Shared.GameObjects
{
if (parent == null) break;
if (parent.TryGetComponent(out EntityLookupComponent? comp)) return comp;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(parent.Uid, out EntityLookupComponent? comp)) return comp;
parent = parent.Transform.Parent?.Owner;
}
@@ -851,7 +851,7 @@ namespace Robust.Shared.GameObjects
pos = ent.Transform.WorldPosition;
return ent.TryGetComponent(out ILookupWorldBox2Component? lookup) ?
return IoCManager.Resolve<IEntityManager>().TryGetComponent(ent.Uid, out ILookupWorldBox2Component? lookup) ?
lookup.GetWorldAABB(pos) :
new Box2(pos, pos);
}

2
Robust.Shared/GameObjects/Systems/OccluderSystem.cs
View File

@@ -82,7 +82,7 @@ namespace Robust.Shared.GameObjects
{
if (parent == null) break;
if (parent.TryGetComponent(out OccluderTreeComponent? comp)) return comp;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(parent.Uid, out OccluderTreeComponent? comp)) return comp;
parent = parent.Transform.Parent?.Owner;
}

4
Robust.Shared/GameObjects/Systems/SharedGridFixtureSystem.cs
View File

@@ -53,13 +53,13 @@ namespace Robust.Shared.GameObjects
DebugTools.Assert(chunk.ValidTiles > 0);
if (!gridEnt.TryGetComponent(out PhysicsComponent? physicsComponent))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(gridEnt.Uid, out PhysicsComponent? physicsComponent))
{
Logger.ErrorS("physics", $"Trying to regenerate collision for {gridEnt} that doesn't have {nameof(physicsComponent)}");
return;
}
if (!gridEnt.TryGetComponent(out FixturesComponent? fixturesComponent))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(gridEnt.Uid, out FixturesComponent? fixturesComponent))
{
Logger.ErrorS("physics", $"Trying to regenerate collision for {gridEnt} that doesn't have {nameof(fixturesComponent)}");
return;

12
Robust.Shared/GameObjects/Systems/SharedPhysicsSystem.cs
View File

@@ -143,14 +143,14 @@ namespace Robust.Shared.GameObjects
var entity = args.Entity;
if (!((!IoCManager.Resolve<IEntityManager>().EntityExists(entity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityLifeStage) >= EntityLifeStage.Initialized) ||
!entity.TryGetComponent(out PhysicsComponent? body) ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out PhysicsComponent? body) ||
entity.IsInContainer()) return;
var oldParent = args.OldParent;
var linearVelocityDiff = Vector2.Zero;
var angularVelocityDiff = 0f;
if (oldParent != null && oldParent.TryGetComponent(out PhysicsComponent? oldBody))
if (oldParent != null && IoCManager.Resolve<IEntityManager>().TryGetComponent(oldParent.Uid, out PhysicsComponent? oldBody))
{
var (linear, angular) = oldBody.MapVelocities;
@@ -160,7 +160,7 @@ namespace Robust.Shared.GameObjects
var newParent = entity.Transform.Parent?.Owner;
if (newParent != null && newParent.TryGetComponent(out PhysicsComponent? newBody))
if (newParent != null && IoCManager.Resolve<IEntityManager>().TryGetComponent(newParent.Uid, out PhysicsComponent? newBody))
{
var (linear, angular) = newBody.MapVelocities;
@@ -234,7 +234,7 @@ namespace Robust.Shared.GameObjects
private void HandleMapChange(EntMapIdChangedMessage message)
{
if (!message.Entity.TryGetComponent(out PhysicsComponent? physicsComponent))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(message.Entity.Uid, out PhysicsComponent? physicsComponent))
return;
Get<SharedJointSystem>().ClearJoints(physicsComponent);
@@ -296,7 +296,7 @@ namespace Robust.Shared.GameObjects
private void HandleContainerInserted(EntInsertedIntoContainerMessage message)
{
if (!message.Entity.TryGetComponent(out PhysicsComponent? physicsComponent)) return;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(message.Entity.Uid, out PhysicsComponent? physicsComponent)) return;
var mapId = message.Container.Owner.Transform.MapID;
@@ -313,7 +313,7 @@ namespace Robust.Shared.GameObjects
private void HandleContainerRemoved(EntRemovedFromContainerMessage message)
{
if (!message.Entity.TryGetComponent(out PhysicsComponent? physicsComponent)) return;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(message.Entity.Uid, out PhysicsComponent? physicsComponent)) return;
var mapId = message.Container.Owner.Transform.MapID;

2
Robust.Shared/Localization/LocalizationManager.Entity.cs
View File

@@ -24,7 +24,7 @@ namespace Robust.Shared.Localization
private bool TryGetEntityLocAttrib(IEntity entity, string attribute, [NotNullWhen(true)] out string? value)
{
if (entity.TryGetComponent<GrammarComponent>(out var grammar) &&
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<GrammarComponent?>(entity.Uid, out var grammar) &&
grammar.Attributes.TryGetValue(attribute, out value))
{
return true;

5
Robust.Shared/Localization/LocalizationManager.Functions.cs
View File

@@ -8,6 +8,7 @@ using Linguini.Shared.Types.Bundle;
using Robust.Shared.Enums;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.Localization;
using Robust.Shared.IoC;
namespace Robust.Shared.Localization
{
@@ -67,7 +68,7 @@ namespace Robust.Shared.Localization
{
IEntity entity = (IEntity)entity0.Value;
if (entity.TryGetComponent<GrammarComponent>(out var grammar) && grammar.Gender.HasValue)
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<GrammarComponent?>(entity.Uid, out var grammar) && grammar.Gender.HasValue)
{
return new LocValueString(grammar.Gender.Value.ToString().ToLowerInvariant());
}
@@ -167,7 +168,7 @@ namespace Robust.Shared.Localization
{
IEntity entity = (IEntity)entity0.Value;
if (entity.TryGetComponent<GrammarComponent>(out var grammar) && grammar.ProperNoun.HasValue)
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<GrammarComponent?>(entity.Uid, out var grammar) && grammar.ProperNoun.HasValue)
{
return new LocValueString(grammar.ProperNoun.Value.ToString().ToLowerInvariant());
}

2
Robust.Shared/Map/MapManager.cs
View File

@@ -352,7 +352,7 @@ namespace Robust.Shared.Map
}
// re-use or add map component
if (!newMapEntity.TryGetComponent(out MapComponent? mapComp))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(newMapEntity.Uid, out MapComponent? mapComp))
{
mapComp = IoCManager.Resolve<IEntityManager>().AddComponent<MapComponent>(newMapEntity);
}

3
Robust.Shared/Physics/PhysicsHelpers.cs
View File

@@ -1,4 +1,5 @@
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
namespace Robust.Shared.Physics
@@ -11,7 +12,7 @@ namespace Robust.Shared.Physics
for (TransformComponent transform = entity.Transform; transform.Parent != null; transform = transform.Parent)
{
if (transform.Owner.TryGetComponent(out PhysicsComponent? physicsComponent))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(transform.Owner.Uid, out PhysicsComponent? physicsComponent))
{
result += physicsComponent.LinearVelocity;
}

12
Robust.Shared/Physics/SharedBroadphaseSystem.cs
View File

@@ -133,7 +133,7 @@ namespace Robust.Shared.Physics
while (_queuedParents.TryDequeue(out var parent))
{
if ((!IoCManager.Resolve<IEntityManager>().EntityExists(parent.Entity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(parent.Entity.Uid).EntityLifeStage) >= EntityLifeStage.Deleted ||
!parent.Entity.TryGetComponent(out PhysicsComponent? body) ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(parent.Entity.Uid, out PhysicsComponent? body) ||
!body.CanCollide) continue;
UpdateBroadphase(body);
@@ -143,7 +143,7 @@ namespace Robust.Shared.Physics
while (_queuedMoves.TryDequeue(out var move))
{
if ((!IoCManager.Resolve<IEntityManager>().EntityExists(move.Sender.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(move.Sender.Uid).EntityLifeStage) >= EntityLifeStage.Deleted ||
!move.Sender.TryGetComponent(out PhysicsComponent? body) ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(move.Sender.Uid, out PhysicsComponent? body) ||
!body.CanCollide) continue;
var worldPos = move.NewPosition.ToMapPos(EntityManager);
@@ -156,7 +156,7 @@ namespace Robust.Shared.Physics
{
if (!_handledThisTick.Add(rotate.Sender.Uid) ||
(!IoCManager.Resolve<IEntityManager>().EntityExists(rotate.Sender.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(rotate.Sender.Uid).EntityLifeStage) >= EntityLifeStage.Deleted ||
!rotate.Sender.TryGetComponent(out PhysicsComponent? body) ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(rotate.Sender.Uid, out PhysicsComponent? body) ||
!body.CanCollide) continue;
var worldPos = rotate.Sender.Transform.WorldPosition;
@@ -790,7 +790,7 @@ namespace Robust.Shared.Physics
private void HandleContainerInsert(EntInsertedIntoContainerMessage ev)
{
if ((!IoCManager.Resolve<IEntityManager>().EntityExists(ev.Entity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(ev.Entity.Uid).EntityLifeStage) >= EntityLifeStage.Deleted || !ev.Entity.TryGetComponent(out PhysicsComponent? physicsComponent)) return;
if ((!IoCManager.Resolve<IEntityManager>().EntityExists(ev.Entity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(ev.Entity.Uid).EntityLifeStage) >= EntityLifeStage.Deleted || !IoCManager.Resolve<IEntityManager>().TryGetComponent(ev.Entity.Uid, out PhysicsComponent? physicsComponent)) return;
physicsComponent.CanCollide = false;
physicsComponent.Awake = false;
@@ -798,7 +798,7 @@ namespace Robust.Shared.Physics
private void HandleContainerRemove(EntRemovedFromContainerMessage ev)
{
if ((!IoCManager.Resolve<IEntityManager>().EntityExists(ev.Entity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(ev.Entity.Uid).EntityLifeStage) >= EntityLifeStage.Deleted || !ev.Entity.TryGetComponent(out PhysicsComponent? physicsComponent)) return;
if ((!IoCManager.Resolve<IEntityManager>().EntityExists(ev.Entity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(ev.Entity.Uid).EntityLifeStage) >= EntityLifeStage.Deleted || !IoCManager.Resolve<IEntityManager>().TryGetComponent(ev.Entity.Uid, out PhysicsComponent? physicsComponent)) return;
physicsComponent.CanCollide = true;
physicsComponent.Awake = true;
@@ -873,7 +873,7 @@ namespace Robust.Shared.Physics
{
if (parent == null) break;
if (parent.TryGetComponent(out BroadphaseComponent? comp)) return comp;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(parent.Uid, out BroadphaseComponent? comp)) return comp;
parent = parent.Transform.Parent?.Owner;
}

2
Robust.Shared/Player/Filter.cs
View File

@@ -184,7 +184,7 @@ namespace Robust.Shared.Player
{
return RemoveWhere(session =>
session.AttachedEntity == null
|| !session.AttachedEntity.TryGetComponent(out SharedEyeComponent? eye)
|| !IoCManager.Resolve<IEntityManager>().TryGetComponent(session.AttachedEntity.Uid, out SharedEyeComponent? eye)
|| (eye.VisibilityMask & flag) == 0);
}

2
Robust.UnitTesting/Server/GameObjects/Components/Container_Test.cs
View File

@@ -323,7 +323,7 @@ namespace Robust.UnitTesting.Server.GameObjects.Components
public override bool CanInsert(IEntity toinsert)
{
return toinsert.TryGetComponent(out IContainerManager? _);
return IoCManager.Resolve<IEntityManager>().TryGetComponent(toinsert.Uid, out IContainerManager? _);
}
}
}

6
Robust.UnitTesting/Shared/Serialization/InheritanceSerializationTest.cs
View File

@@ -73,18 +73,18 @@ namespace Robust.UnitTesting.Shared.Serialization
var baseEntity = entityManager.SpawnEntity(BaseEntityId, coordinates);
Assert.That(baseEntity.TryGetComponent(out BaseComponent? baseComponent));
Assert.That(IoCManager.Resolve<IEntityManager>().TryGetComponent(baseEntity.Uid, out BaseComponent? baseComponent));
Assert.That(baseComponent!.BaseField, Is.EqualTo(BaseComponentFieldValue));
var inheritorEntity = entityManager.SpawnEntity(InheritorEntityId, coordinates);
Assert.That(inheritorEntity.TryGetComponent(out InheritorComponent? inheritorComponent));
Assert.That(IoCManager.Resolve<IEntityManager>().TryGetComponent(inheritorEntity.Uid, out InheritorComponent? inheritorComponent));
Assert.That(inheritorComponent!.BaseField, Is.EqualTo(BaseComponentFieldValue));
Assert.That(inheritorComponent!.InheritorField, Is.EqualTo(InheritorComponentFieldValue));
var finalEntity = entityManager.SpawnEntity(FinalEntityId, coordinates);
Assert.That(finalEntity.TryGetComponent(out FinalComponent? finalComponent));
Assert.That(IoCManager.Resolve<IEntityManager>().TryGetComponent(finalEntity.Uid, out FinalComponent? finalComponent));
Assert.That(finalComponent!.BaseField, Is.EqualTo(BaseComponentFieldValue));
Assert.That(finalComponent!.InheritorField, Is.EqualTo(InheritorComponentFieldValue));
Assert.That(finalComponent!.FinalField, Is.EqualTo(FinalComponentFieldValue));