Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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 2ff4ec65d5
commit 69b270017b
425 changed files with 1143 additions and 995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,8 @@ using Content.Shared.Storage.Components;
using Content.Shared.Storage.EntitySystems;
using JetBrains.Annotations;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
namespace Content.Server.Storage.EntitySystems
{
@@ -11,7 +13,7 @@ namespace Content.Server.Storage.EntitySystems
{
protected override int? GetCount(ContainerModifiedMessage msg, ItemCounterComponent itemCounter)
{
if (!msg.Container.Owner.TryGetComponent(out ServerStorageComponent? component)
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(msg.Container.Owner.Uid, out ServerStorageComponent? component)
|| component.StoredEntities == null)
{
return null;

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

@@ -6,6 +6,7 @@ using JetBrains.Annotations;
using Robust.Shared.Analyzers;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
namespace Content.Server.Storage.EntitySystems
{
@@ -16,7 +17,7 @@ namespace Content.Server.Storage.EntitySystems
ItemMapperComponent itemMapper,
out IReadOnlyList<string> showLayers)
{
if (msg.Container.Owner.TryGetComponent(out ServerStorageComponent? component))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(msg.Container.Owner.Uid, out ServerStorageComponent? component))
{
var containedLayers = component.StoredEntities ?? new List<IEntity>();
var list = new List<string>();

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

@@ -59,7 +59,7 @@ namespace Content.Server.Storage.EntitySystems
}
if (entityToPlaceInHands != null
&& args.User.TryGetComponent<SharedHandsComponent>(out var hands))
&& IoCManager.Resolve<IEntityManager>().TryGetComponent<SharedHandsComponent?>(args.User.Uid, out var hands))
{
hands.TryPutInAnyHand(entityToPlaceInHands);
}

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

@@ -117,7 +117,7 @@ namespace Content.Server.Storage.EntitySystems
{
var oldParentEntity = message.Container.Owner;
if (oldParentEntity.TryGetComponent(out ServerStorageComponent? storageComp))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(oldParentEntity.Uid, out ServerStorageComponent? storageComp))
{
storageComp.HandleEntityMaybeRemoved(message);
}
@@ -127,7 +127,7 @@ namespace Content.Server.Storage.EntitySystems
{
var oldParentEntity = message.Container.Owner;
if (oldParentEntity.TryGetComponent(out ServerStorageComponent? storageComp))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(oldParentEntity.Uid, out ServerStorageComponent? storageComp))
{
storageComp.HandleEntityMaybeInserted(message);
}