Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

12
Content.Server/Construction/Commands/FixRotationsCommand.cs
View File

@@ -36,7 +36,7 @@ namespace Content.Server.Construction.Commands
return;
}
gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.AttachedEntity.Uid).GridID;
gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.AttachedEntity).GridID;
break;
case 1:
if (!int.TryParse(args[0], out var id))
@@ -67,7 +67,7 @@ namespace Content.Server.Construction.Commands
}
var changed = 0;
foreach (var childUid in IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(gridEntity.Uid).ChildEntityUids)
foreach (var childUid in IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(gridEntity).ChildEntityUids)
{
if (!entityManager.TryGetEntity(childUid, out var childEntity))
{
@@ -83,9 +83,9 @@ namespace Content.Server.Construction.Commands
valid |= occluder.Enabled;
}
// low walls & grilles
valid |= IoCManager.Resolve<IEntityManager>().HasComponent<SharedCanBuildWindowOnTopComponent>(childEntity.Uid);
valid |= IoCManager.Resolve<IEntityManager>().HasComponent<SharedCanBuildWindowOnTopComponent>(childEntity);
// cables
valid |= IoCManager.Resolve<IEntityManager>().HasComponent<CableComponent>(childEntity.Uid);
valid |= IoCManager.Resolve<IEntityManager>().HasComponent<CableComponent>(childEntity);
// anything else that might need this forced
valid |= childEntity.HasTag("ForceFixRotations");
// override
@@ -96,9 +96,9 @@ namespace Content.Server.Construction.Commands
continue;
}
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(childEntity.Uid).LocalRotation != Angle.Zero)
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(childEntity).LocalRotation != Angle.Zero)
{
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(childEntity.Uid).LocalRotation = Angle.Zero;
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(childEntity).LocalRotation = Angle.Zero;
changed++;
}
}

12
Content.Server/Construction/Commands/TileWallsCommand.cs
View File

@@ -32,7 +32,7 @@ namespace Content.Server.Construction.Commands
return;
}
gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.AttachedEntity.Uid).GridID;
gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.AttachedEntity).GridID;
break;
case 1:
if (!int.TryParse(args[0], out var id))
@@ -67,14 +67,14 @@ namespace Content.Server.Construction.Commands
var underplating = tileDefinitionManager["underplating"];
var underplatingTile = new Robust.Shared.Map.Tile(underplating.TileId);
var changed = 0;
foreach (var childUid in IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(gridEntity.Uid).ChildEntityUids)
foreach (var childUid in IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(gridEntity).ChildEntityUids)
{
if (!entityManager.TryGetEntity(childUid, out var childEntity))
{
continue;
}
var prototype = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(childEntity.Uid).EntityPrototype;
var prototype = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(childEntity).EntityPrototype;
while (true)
{
if (prototype?.Parent == null)
@@ -90,12 +90,12 @@ namespace Content.Server.Construction.Commands
continue;
}
if (!IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(childEntity.Uid).Anchored)
if (!IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(childEntity).Anchored)
{
continue;
}
var tile = grid.GetTileRef(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(childEntity.Uid).Coordinates);
var tile = grid.GetTileRef(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(childEntity).Coordinates);
var tileDef = (ContentTileDefinition) tileDefinitionManager[tile.Tile.TypeId];
if (tileDef.Name == "underplating")
@@ -103,7 +103,7 @@ namespace Content.Server.Construction.Commands
continue;
}
grid.SetTile(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(childEntity.Uid).Coordinates, underplatingTile);
grid.SetTile(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(childEntity).Coordinates, underplatingTile);
changed++;
}