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

2
Content.Server/Storage/Components/CursedEntityStorageComponent.cs
View File

@@ -40,7 +40,7 @@ namespace Content.Server.Storage.Components
if (lockerEnt == null) return; // No valid lockers anywhere.
var locker = IoCManager.Resolve<IEntityManager>().GetComponent<EntityStorageComponent>(lockerEnt.Uid);
var locker = IoCManager.Resolve<IEntityManager>().GetComponent<EntityStorageComponent>(lockerEnt);
if (locker.Open)
locker.TryCloseStorage(Owner);

40
Content.Server/Storage/Components/EntityStorageComponent.cs
View File

@@ -152,9 +152,9 @@ namespace Content.Server.Storage.Components
Contents.ShowContents = _showContents;
Contents.OccludesLight = _occludesLight;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<PlaceableSurfaceComponent?>(Owner.Uid, out var surface))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<PlaceableSurfaceComponent?>(Owner, out var surface))
{
EntitySystem.Get<PlaceableSurfaceSystem>().SetPlaceable(Owner.Uid, Open, surface);
EntitySystem.Get<PlaceableSurfaceSystem>().SetPlaceable(Owner, Open, surface);
}
UpdateAppearance();
@@ -173,7 +173,7 @@ namespace Content.Server.Storage.Components
return false;
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<LockComponent?>(Owner.Uid, out var @lock) && @lock.Locked)
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<LockComponent?>(Owner, out var @lock) && @lock.Locked)
{
if (!silent) Owner.PopupMessage(user, Loc.GetString("entity-storage-component-locked-message"));
return false;
@@ -218,13 +218,13 @@ namespace Content.Server.Storage.Components
// 5. if this is NOT AN ITEM, then mobs can always be eaten unless unless a previous law prevents it
// Let's not insert admin ghosts, yeah? This is really a a hack and should be replaced by attempt events
if (IoCManager.Resolve<IEntityManager>().HasComponent<GhostComponent>(entity.Uid))
if (IoCManager.Resolve<IEntityManager>().HasComponent<GhostComponent>(entity))
continue;
// checks
var targetIsItem = IoCManager.Resolve<IEntityManager>().HasComponent<SharedItemComponent>(entity.Uid);
var targetIsMob = IoCManager.Resolve<IEntityManager>().HasComponent<SharedBodyComponent>(entity.Uid);
var targetIsItem = IoCManager.Resolve<IEntityManager>().HasComponent<SharedItemComponent>(entity);
var targetIsMob = IoCManager.Resolve<IEntityManager>().HasComponent<SharedBodyComponent>(entity);
var storageIsItem = IoCManager.Resolve<IEntityManager>().HasComponent<SharedItemComponent>(OwnerUid);
var allowedToEat = false;
@@ -270,7 +270,7 @@ namespace Content.Server.Storage.Components
private void UpdateAppearance()
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner.Uid, out AppearanceComponent? appearance))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out AppearanceComponent? appearance))
{
appearance.SetData(StorageVisuals.CanWeld, _canWeldShut);
appearance.SetData(StorageVisuals.Welded, _isWeldedShut);
@@ -279,7 +279,7 @@ namespace Content.Server.Storage.Components
private void ModifyComponents()
{
if (!_isCollidableWhenOpen && IoCManager.Resolve<IEntityManager>().TryGetComponent<FixturesComponent?>(Owner.Uid, out var manager))
if (!_isCollidableWhenOpen && IoCManager.Resolve<IEntityManager>().TryGetComponent<FixturesComponent?>(Owner, out var manager))
{
if (Open)
{
@@ -297,12 +297,12 @@ namespace Content.Server.Storage.Components
}
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<PlaceableSurfaceComponent?>(Owner.Uid, out var surface))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<PlaceableSurfaceComponent?>(Owner, out var surface))
{
EntitySystem.Get<PlaceableSurfaceSystem>().SetPlaceable(Owner.Uid, Open, surface);
EntitySystem.Get<PlaceableSurfaceSystem>().SetPlaceable(Owner, Open, surface);
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner.Uid, out AppearanceComponent? appearance))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out AppearanceComponent? appearance))
{
appearance.SetData(StorageVisuals.Open, Open);
}
@@ -311,7 +311,7 @@ namespace Content.Server.Storage.Components
protected virtual bool AddToContents(IEntity entity)
{
if (entity == Owner) return false;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out IPhysBody? entityPhysicsComponent))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out IPhysBody? entityPhysicsComponent))
{
if (MaxSize < entityPhysicsComponent.GetWorldAABB().Size.X
|| MaxSize < entityPhysicsComponent.GetWorldAABB().Size.Y)
@@ -325,7 +325,7 @@ namespace Content.Server.Storage.Components
public virtual Vector2 ContentsDumpPosition()
{
return IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).WorldPosition;
return IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner).WorldPosition;
}
private void EmptyContents()
@@ -334,8 +334,8 @@ namespace Content.Server.Storage.Components
{
if (Contents.Remove(contained))
{
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(contained.Uid).WorldPosition = ContentsDumpPosition();
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<IPhysBody?>(contained.Uid, out var physics))
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(contained).WorldPosition = ContentsDumpPosition();
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<IPhysBody?>(contained, out var physics))
{
physics.CanCollide = true;
}
@@ -369,14 +369,14 @@ namespace Content.Server.Storage.Components
// Trying to add while open just dumps it on the ground below us.
if (Open)
{
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity.Uid).WorldPosition = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).WorldPosition;
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).WorldPosition = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner).WorldPosition;
return true;
}
if (!Contents.Insert(entity)) return false;
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity.Uid).LocalPosition = Vector2.Zero;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out IPhysBody? body))
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).LocalPosition = Vector2.Zero;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out IPhysBody? body))
{
body.CanCollide = false;
}
@@ -430,7 +430,7 @@ namespace Content.Server.Storage.Components
var toolSystem = EntitySystem.Get<ToolSystem>();
if (!await toolSystem.UseTool(eventArgs.Using.Uid, eventArgs.User.Uid, Owner.Uid, 1f, 1f, _weldingQuality))
if (!await toolSystem.UseTool(eventArgs.Using, eventArgs.User, Owner, 1f, 1f, _weldingQuality))
{
_beingWelded = false;
return false;
@@ -463,7 +463,7 @@ namespace Content.Server.Storage.Components
var containedEntities = Contents.ContainedEntities.ToList();
foreach (var entity in containedEntities)
{
var exActs = IoCManager.Resolve<IEntityManager>().GetComponents<IExAct>(entity.Uid).ToArray();
var exActs = IoCManager.Resolve<IEntityManager>().GetComponents<IExAct>(entity).ToArray();
foreach (var exAct in exActs)
{
exAct.OnExplosion(eventArgs);

14
Content.Server/Storage/Components/SecretStashComponent.cs
View File

@@ -28,7 +28,7 @@ namespace Content.Server.Storage.Components
[ViewVariables] private ContainerSlot _itemContainer = default!;
public string SecretPartName => _secretPartNameOverride ?? Loc.GetString("comp-secret-stash-secret-part-name", ("name", IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner.Uid).EntityName));
public string SecretPartName => _secretPartNameOverride ?? Loc.GetString("comp-secret-stash-secret-part-name", ("name", IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner).EntityName));
protected override void Initialize()
{
@@ -50,7 +50,7 @@ namespace Content.Server.Storage.Components
return false;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(itemToHide.Uid, out ItemComponent? item))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(itemToHide, out ItemComponent? item))
return false;
if (item.Size > _maxItemSize)
@@ -60,7 +60,7 @@ namespace Content.Server.Storage.Components
return false;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(user.Uid, out HandsComponent? hands))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(user, out HandsComponent? hands))
return false;
if (!hands.Drop(itemToHide, _itemContainer))
@@ -83,15 +83,15 @@ namespace Content.Server.Storage.Components
Owner.PopupMessage(user, Loc.GetString("comp-secret-stash-action-get-item-found-something", ("stash", SecretPartName)));
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(user.Uid, out HandsComponent? hands))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(user, out HandsComponent? hands))
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(_itemContainer.ContainedEntity.Uid, out ItemComponent? item))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(_itemContainer.ContainedEntity, out ItemComponent? item))
return false;
hands.PutInHandOrDrop(item);
}
else if (_itemContainer.Remove(_itemContainer.ContainedEntity))
{
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(_itemContainer.ContainedEntity.Uid).Coordinates = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).Coordinates;
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(_itemContainer.ContainedEntity).Coordinates = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner).Coordinates;
}
return true;
@@ -111,7 +111,7 @@ namespace Content.Server.Storage.Components
// drop item inside
if (_itemContainer.ContainedEntity != null)
{
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(_itemContainer.ContainedEntity.Uid).Coordinates = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).Coordinates;
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(_itemContainer.ContainedEntity).Coordinates = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner).Coordinates;
}
}
}

64
Content.Server/Storage/Components/ServerStorageComponent.cs
View File

@@ -129,7 +129,7 @@ namespace Content.Server.Storage.Components
foreach (var entity in Storage.ContainedEntities)
{
var item = IoCManager.Resolve<IEntityManager>().GetComponent<SharedItemComponent>(entity.Uid);
var item = IoCManager.Resolve<IEntityManager>().GetComponent<SharedItemComponent>(entity);
_storageUsed += item.Size;
}
}
@@ -143,24 +143,24 @@ namespace Content.Server.Storage.Components
{
EnsureInitialCalculated();
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out ServerStorageComponent? storage) &&
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out ServerStorageComponent? storage) &&
storage._storageCapacityMax >= _storageCapacityMax)
{
return false;
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out SharedItemComponent? store) &&
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out SharedItemComponent? store) &&
store.Size > _storageCapacityMax - _storageUsed)
{
return false;
}
if (_whitelist != null && !_whitelist.IsValid(entity.Uid))
if (_whitelist != null && !_whitelist.IsValid(entity))
{
return false;
}
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity.Uid).Anchored)
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Anchored)
{
return false;
}
@@ -194,10 +194,10 @@ namespace Content.Server.Storage.Components
PlaySoundCollection();
EnsureInitialCalculated();
Logger.DebugS(LoggerName, $"Storage (UID {Owner.Uid}) had entity (UID {message.Entity.Uid}) inserted into it.");
Logger.DebugS(LoggerName, $"Storage (UID {Owner}) had entity (UID {message.Entity}) inserted into it.");
var size = 0;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(message.Entity.Uid, out SharedItemComponent? storable))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(message.Entity, out SharedItemComponent? storable))
size = storable.Size;
_storageUsed += size;
@@ -219,7 +219,7 @@ namespace Content.Server.Storage.Components
if (!_sizeCache.TryGetValue(message.Entity, out var size))
{
Logger.WarningS(LoggerName, $"Removed entity {message.Entity} without a cached size from storage {Owner} at {IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).MapPosition}");
Logger.WarningS(LoggerName, $"Removed entity {message.Entity} without a cached size from storage {Owner} at {IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner).MapPosition}");
RecalculateStorageUsed();
return;
@@ -239,7 +239,7 @@ namespace Content.Server.Storage.Components
{
EnsureInitialCalculated();
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(player.Uid, out HandsComponent? hands) ||
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(player, out HandsComponent? hands) ||
hands.GetActiveHand == null)
{
return false;
@@ -290,9 +290,9 @@ namespace Content.Server.Storage.Components
PlaySoundCollection();
EnsureInitialCalculated();
var userSession = IoCManager.Resolve<IEntityManager>().GetComponent<ActorComponent>(entity.Uid).PlayerSession;
var userSession = IoCManager.Resolve<IEntityManager>().GetComponent<ActorComponent>(entity).PlayerSession;
Logger.DebugS(LoggerName, $"Storage (UID {Owner.Uid}) \"used\" by player session (UID {userSession.AttachedEntityUid}).");
Logger.DebugS(LoggerName, $"Storage (UID {Owner}) \"used\" by player session (UID {userSession.AttachedEntityUid}).");
SubscribeSession(userSession);
#pragma warning disable 618
@@ -320,7 +320,7 @@ namespace Content.Server.Storage.Components
{
if (session.AttachedEntity == null)
{
Logger.DebugS(LoggerName, $"Storage (UID {Owner.Uid}) detected no attached entity in player session (UID {session.AttachedEntityUid}).");
Logger.DebugS(LoggerName, $"Storage (UID {Owner}) detected no attached entity in player session (UID {session.AttachedEntityUid}).");
UnsubscribeSession(session);
return;
@@ -340,7 +340,7 @@ namespace Content.Server.Storage.Components
return;
}
var stored = StoredEntities.Select(e => e.Uid).ToArray();
var stored = StoredEntities.Select(e => (EntityUid) e).ToArray();
#pragma warning disable 618
SendNetworkMessage(new StorageHeldItemsMessage(stored, _storageUsed, _storageCapacityMax), session.ConnectedClient);
@@ -357,7 +357,7 @@ namespace Content.Server.Storage.Components
if (!SubscribedSessions.Contains(session))
{
Logger.DebugS(LoggerName, $"Storage (UID {Owner.Uid}) subscribed player session (UID {session.AttachedEntityUid}).");
Logger.DebugS(LoggerName, $"Storage (UID {Owner}) subscribed player session (UID {session.AttachedEntityUid}).");
session.PlayerStatusChanged += HandlePlayerSessionChangeEvent;
SubscribedSessions.Add(session);
@@ -375,7 +375,7 @@ namespace Content.Server.Storage.Components
{
if (SubscribedSessions.Contains(session))
{
Logger.DebugS(LoggerName, $"Storage (UID {Owner.Uid}) unsubscribed player session (UID {session.AttachedEntityUid}).");
Logger.DebugS(LoggerName, $"Storage (UID {Owner}) unsubscribed player session (UID {session.AttachedEntityUid}).");
SubscribedSessions.Remove(session);
#pragma warning disable 618
@@ -400,13 +400,13 @@ namespace Content.Server.Storage.Components
foreach (var entity in StoredEntities)
{
if (_entityManager.TryGetComponent(entity.Uid, out ServerStorageComponent storageComponent))
if (_entityManager.TryGetComponent(entity, out ServerStorageComponent storageComponent))
{
DebugTools.Assert(storageComponent != this, $"Storage component contains itself!? Entity: {OwnerUid}");
storageComponent.UnsubscribeSession(session);
}
if (_entityManager.TryGetComponent(entity.Uid, out ServerUserInterfaceComponent uiComponent))
if (_entityManager.TryGetComponent(entity, out ServerUserInterfaceComponent uiComponent))
{
foreach (var ui in uiComponent.Interfaces)
{
@@ -418,7 +418,7 @@ namespace Content.Server.Storage.Components
private void HandlePlayerSessionChangeEvent(object? obj, SessionStatusEventArgs sessionStatus)
{
Logger.DebugS(LoggerName, $"Storage (UID {Owner.Uid}) handled a status change in player session (UID {sessionStatus.Session.AttachedEntityUid}).");
Logger.DebugS(LoggerName, $"Storage (UID {Owner}) handled a status change in player session (UID {sessionStatus.Session.AttachedEntityUid}).");
if (sessionStatus.NewStatus != SessionStatus.InGame)
{
@@ -459,8 +459,8 @@ namespace Content.Server.Storage.Components
break;
}
var ownerTransform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid);
var playerTransform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.Uid);
var ownerTransform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner);
var playerTransform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player);
if (!playerTransform.Coordinates.InRange(IoCManager.Resolve<IEntityManager>(), ownerTransform.Coordinates, 2) ||
Owner.IsInContainer() && !playerTransform.ContainsEntity(ownerTransform))
@@ -473,7 +473,7 @@ namespace Content.Server.Storage.Components
break;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out ItemComponent? item) || !IoCManager.Resolve<IEntityManager>().TryGetComponent(player.Uid, out HandsComponent? hands))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out ItemComponent? item) || !IoCManager.Resolve<IEntityManager>().TryGetComponent(player, out HandsComponent? hands))
{
break;
}
@@ -529,9 +529,9 @@ namespace Content.Server.Storage.Components
{
if (!_clickInsert)
return false;
Logger.DebugS(LoggerName, $"Storage (UID {Owner.Uid}) attacked by user (UID {eventArgs.User.Uid}) with entity (UID {eventArgs.Using.Uid}).");
Logger.DebugS(LoggerName, $"Storage (UID {Owner}) attacked by user (UID {eventArgs.User}) with entity (UID {eventArgs.Using}).");
if (IoCManager.Resolve<IEntityManager>().HasComponent<PlaceableSurfaceComponent>(Owner.Uid))
if (IoCManager.Resolve<IEntityManager>().HasComponent<PlaceableSurfaceComponent>(Owner))
{
return false;
}
@@ -570,14 +570,14 @@ namespace Content.Server.Storage.Components
// Pick up all entities in a radius around the clicked location.
// The last half of the if is because carpets exist and this is terrible
if (_areaInsert && (eventArgs.Target == null || !IoCManager.Resolve<IEntityManager>().HasComponent<SharedItemComponent>(eventArgs.Target.Uid)))
if (_areaInsert && (eventArgs.Target == null || !IoCManager.Resolve<IEntityManager>().HasComponent<SharedItemComponent>(eventArgs.Target)))
{
var validStorables = new List<IEntity>();
foreach (var entity in IoCManager.Resolve<IEntityLookup>().GetEntitiesInRange(eventArgs.ClickLocation, _areaInsertRadius, LookupFlags.None))
{
if (entity.IsInContainer()
|| entity == eventArgs.User
|| !IoCManager.Resolve<IEntityManager>().HasComponent<SharedItemComponent>(entity.Uid)
|| !IoCManager.Resolve<IEntityManager>().HasComponent<SharedItemComponent>(entity)
|| !EntitySystem.Get<InteractionSystem>().InRangeUnobstructed(eventArgs.User, entity))
continue;
validStorables.Add(entity);
@@ -605,12 +605,12 @@ namespace Content.Server.Storage.Components
// Check again, situation may have changed for some entities, but we'll still pick up any that are valid
if (entity.IsInContainer()
|| entity == eventArgs.User
|| !IoCManager.Resolve<IEntityManager>().HasComponent<SharedItemComponent>(entity.Uid))
|| !IoCManager.Resolve<IEntityManager>().HasComponent<SharedItemComponent>(entity))
continue;
var position = EntityCoordinates.FromMap(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).Parent?.Owner ?? Owner, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity.Uid).MapPosition);
var position = EntityCoordinates.FromMap(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner).Parent?.Owner ?? Owner, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).MapPosition);
if (PlayerInsertEntityInWorld(eventArgs.User, entity))
{
successfullyInserted.Add(entity.Uid);
successfullyInserted.Add(entity);
successfullyInsertedPositions.Add(position);
}
}
@@ -636,15 +636,15 @@ namespace Content.Server.Storage.Components
if (eventArgs.Target == null
|| eventArgs.Target.IsInContainer()
|| eventArgs.Target == eventArgs.User
|| !IoCManager.Resolve<IEntityManager>().HasComponent<SharedItemComponent>(eventArgs.Target.Uid))
|| !IoCManager.Resolve<IEntityManager>().HasComponent<SharedItemComponent>(eventArgs.Target))
return false;
var position = EntityCoordinates.FromMap(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).Parent?.Owner ?? Owner, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(eventArgs.Target.Uid).MapPosition);
var position = EntityCoordinates.FromMap(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner).Parent?.Owner ?? Owner, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(eventArgs.Target).MapPosition);
if (PlayerInsertEntityInWorld(eventArgs.User, eventArgs.Target))
{
#pragma warning disable 618
SendNetworkMessage(new AnimateInsertingEntitiesMessage(
#pragma warning restore 618
new List<EntityUid>() { eventArgs.Target.Uid },
new List<EntityUid>() {eventArgs.Target},
new List<EntityCoordinates>() { position }
));
return true;
@@ -685,7 +685,7 @@ namespace Content.Server.Storage.Components
foreach (var entity in storedEntities)
{
var exActs = IoCManager.Resolve<IEntityManager>().GetComponents<IExAct>(entity.Uid).ToArray();
var exActs = IoCManager.Resolve<IEntityManager>().GetComponents<IExAct>(entity).ToArray();
foreach (var exAct in exActs)
{
exAct.OnExplosion(eventArgs);

4
Content.Server/Storage/Components/StorageFillComponent.cs
View File

@@ -28,7 +28,7 @@ namespace Content.Server.Storage.Components
return;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner.Uid, out IStorageComponent? storage))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out IStorageComponent? storage))
{
Logger.Error($"StorageFillComponent couldn't find any StorageComponent ({Owner})");
return;
@@ -51,7 +51,7 @@ namespace Content.Server.Storage.Components
for (var i = 0; i < storageItem.Amount; i++)
{
storage.Insert(
IoCManager.Resolve<IEntityManager>().SpawnEntity(storageItem.PrototypeId, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).Coordinates));
IoCManager.Resolve<IEntityManager>().SpawnEntity(storageItem.PrototypeId, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner).Coordinates));
}
if (!string.IsNullOrEmpty(storageItem.GroupId)) alreadySpawnedGroups.Add(storageItem.GroupId);

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);