Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Replace IEntityManager resolves in systems for cached EntityManager

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-08 13:00:43 +01:00
parent 2699540526
commit c8b65be747
98 changed files with 338 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Storage/EntitySystems/ItemCounterSystem.cs
View File

@@ -13,7 +13,7 @@ namespace Content.Server.Storage.EntitySystems
{
protected override int? GetCount(ContainerModifiedMessage msg, ItemCounterComponent itemCounter)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(msg.Container.Owner, out ServerStorageComponent? component)
if (!EntityManager.TryGetComponent(msg.Container.Owner, out ServerStorageComponent? component)
|| component.StoredEntities == null)
{
return null;

2
Content.Server/Storage/EntitySystems/ItemMapperSystem.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Server.Storage.EntitySystems
ItemMapperComponent itemMapper,
out IReadOnlyList<string> showLayers)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(msg.Container.Owner, out ServerStorageComponent? component))
if (EntityManager.TryGetComponent(msg.Container.Owner, out ServerStorageComponent? component))
{
var containedLayers = component.StoredEntities ?? new List<EntityUid>();
var list = new List<string>();

16
Content.Server/Storage/EntitySystems/StorageSystem.cs
View File

@@ -92,7 +92,7 @@ namespace Content.Server.Storage.EntitySystems
return;
// Get the session for the user
var session = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<ActorComponent>(args.User)?.PlayerSession;
var session = EntityManager.GetComponentOrNull<ActorComponent>(args.User)?.PlayerSession;
if (session == null)
return;
@@ -118,7 +118,7 @@ namespace Content.Server.Storage.EntitySystems
{
var oldParentEntity = message.Container.Owner;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(oldParentEntity, out ServerStorageComponent? storageComp))
if (EntityManager.TryGetComponent(oldParentEntity, out ServerStorageComponent? storageComp))
{
storageComp.HandleEntityMaybeRemoved(message);
}
@@ -128,7 +128,7 @@ namespace Content.Server.Storage.EntitySystems
{
var oldParentEntity = message.Container.Owner;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(oldParentEntity, out ServerStorageComponent? storageComp))
if (EntityManager.TryGetComponent(oldParentEntity, out ServerStorageComponent? storageComp))
{
storageComp.HandleEntityMaybeInserted(message);
}
@@ -144,19 +144,19 @@ namespace Content.Server.Storage.EntitySystems
if (_sessionCache.Count == 0)
return;
var storagePos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(storageComp.Owner).WorldPosition;
var storageMap = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(storageComp.Owner).MapID;
var storagePos = EntityManager.GetComponent<TransformComponent>(storageComp.Owner).WorldPosition;
var storageMap = EntityManager.GetComponent<TransformComponent>(storageComp.Owner).MapID;
foreach (var session in _sessionCache)
{
// The component manages the set of sessions, so this invalid session should be removed soon.
if (session.AttachedEntity is not {} attachedEntity || !IoCManager.Resolve<IEntityManager>().EntityExists(attachedEntity))
if (session.AttachedEntity is not {} attachedEntity || !EntityManager.EntityExists(attachedEntity))
continue;
if (storageMap != IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(attachedEntity).MapID)
if (storageMap != EntityManager.GetComponent<TransformComponent>(attachedEntity).MapID)
continue;
var distanceSquared = (storagePos - IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(attachedEntity).WorldPosition).LengthSquared;
var distanceSquared = (storagePos - EntityManager.GetComponent<TransformComponent>(attachedEntity).WorldPosition).LengthSquared;
if (distanceSquared > SharedInteractionSystem.InteractionRangeSquared)
{
storageComp.UnsubscribeSession(session);