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

Inline UID

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 15:53:09 +01:00
parent 2654775bf0
commit 5cd42c9ad6
803 changed files with 3613 additions and 3577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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.Uid, out ServerStorageComponent? component)
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(msg.Container.Owner, out ServerStorageComponent? component)
|| component.StoredEntities == null)
{
return null;
@@ -22,7 +22,7 @@ namespace Content.Server.Storage.EntitySystems
var count = 0;
foreach (var entity in component.StoredEntities)
{
if (itemCounter.Count.IsValid(entity.Uid)) count++;
if (itemCounter.Count.IsValid(entity)) count++;
}
return count;

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

@@ -17,7 +17,7 @@ namespace Content.Server.Storage.EntitySystems
ItemMapperComponent itemMapper,
out IReadOnlyList<string> showLayers)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(msg.Container.Owner.Uid, out ServerStorageComponent? component))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(msg.Container.Owner, out ServerStorageComponent? component))
{
var containedLayers = component.StoredEntities ?? new List<IEntity>();
var list = new List<string>();
@@ -25,7 +25,7 @@ namespace Content.Server.Storage.EntitySystems
{
foreach (var entity in containedLayers)
{
if (mapLayerData.Whitelist.IsValid(entity.Uid))
if (mapLayerData.Whitelist.IsValid(entity))
{
list.Add(mapLayerData.Layer);
break;

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

@@ -42,7 +42,7 @@ namespace Content.Server.Storage.EntitySystems
for (var i = 0; i < storageItem.Amount; i++)
{
entityToPlaceInHands = EntityManager.SpawnEntity(storageItem.PrototypeId, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(args.User.Uid).Coordinates);
entityToPlaceInHands = EntityManager.SpawnEntity(storageItem.PrototypeId, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(args.User).Coordinates);
}
if (!string.IsNullOrEmpty(storageItem.GroupId)) alreadySpawnedGroups.Add(storageItem.GroupId);
@@ -55,11 +55,11 @@ namespace Content.Server.Storage.EntitySystems
if (component.Uses == 0)
{
args.Handled = true;
IoCManager.Resolve<IEntityManager>().DeleteEntity(owner.Uid);
IoCManager.Resolve<IEntityManager>().DeleteEntity((EntityUid) owner);
}
if (entityToPlaceInHands != null
&& IoCManager.Resolve<IEntityManager>().TryGetComponent<SharedHandsComponent?>(args.User.Uid, out var hands))
&& IoCManager.Resolve<IEntityManager>().TryGetComponent<SharedHandsComponent?>(args.User, out var hands))
{
hands.TryPutInAnyHand(entityToPlaceInHands);
}

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

@@ -37,7 +37,7 @@ namespace Content.Server.Storage.EntitySystems
private void OnRelayMovement(EntityUid uid, EntityStorageComponent component, RelayMovementEntityEvent args)
{
if (EntityManager.HasComponent<HandsComponent>(args.Entity.Uid))
if (EntityManager.HasComponent<HandsComponent>(args.Entity))
{
if (_gameTiming.CurTime <
component.LastInternalOpenAttempt + EntityStorageComponent.InternalOpenAttemptDelay)
@@ -91,7 +91,7 @@ namespace Content.Server.Storage.EntitySystems
return;
// Get the session for the user
var session = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<ActorComponent>(args.User.Uid)?.PlayerSession;
var session = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<ActorComponent>(args.User)?.PlayerSession;
if (session == null)
return;
@@ -117,7 +117,7 @@ namespace Content.Server.Storage.EntitySystems
{
var oldParentEntity = message.Container.Owner;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(oldParentEntity.Uid, out ServerStorageComponent? storageComp))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(oldParentEntity, out ServerStorageComponent? storageComp))
{
storageComp.HandleEntityMaybeRemoved(message);
}
@@ -127,7 +127,7 @@ namespace Content.Server.Storage.EntitySystems
{
var oldParentEntity = message.Container.Owner;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(oldParentEntity.Uid, out ServerStorageComponent? storageComp))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(oldParentEntity, out ServerStorageComponent? storageComp))
{
storageComp.HandleEntityMaybeInserted(message);
}
@@ -143,21 +143,21 @@ namespace Content.Server.Storage.EntitySystems
if (_sessionCache.Count == 0)
return;
var storagePos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(storageComp.Owner.Uid).WorldPosition;
var storageMap = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(storageComp.Owner.Uid).MapID;
var storagePos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(storageComp.Owner).WorldPosition;
var storageMap = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(storageComp.Owner).MapID;
foreach (var session in _sessionCache)
{
var attachedEntity = session.AttachedEntity;
// The component manages the set of sessions, so this invalid session should be removed soon.
if (attachedEntity == null || !IoCManager.Resolve<IEntityManager>().EntityExists(attachedEntity.Uid))
if (attachedEntity == null || !IoCManager.Resolve<IEntityManager>().EntityExists(attachedEntity))
continue;
if (storageMap != IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(attachedEntity.Uid).MapID)
if (storageMap != IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(attachedEntity).MapID)
continue;
var distanceSquared = (storagePos - IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(attachedEntity.Uid).WorldPosition).LengthSquared;
var distanceSquared = (storagePos - IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(attachedEntity).WorldPosition).LengthSquared;
if (distanceSquared > InteractionSystem.InteractionRangeSquared)
{
storageComp.UnsubscribeSession(session);