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

Nullable grid Uid (#8798)

Browse Source
This commit is contained in:
Leon Friedrich
2022-06-20 12:14:35 +12:00
committed by GitHub
parent ef41cd5aa8
commit fa4c6f63f8
82 changed files with 318 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@ namespace Content.Server.Construction.Commands
{
var player = shell.Player as IPlayerSession;
var entityManager = IoCManager.Resolve<IEntityManager>();
EntityUid gridId;
EntityUid? gridId;
var xformQuery = entityManager.GetEntityQuery<TransformComponent>();
switch (args.Length)
@@ -33,7 +33,7 @@ namespace Content.Server.Construction.Commands
return;
}
gridId = xformQuery.GetComponent(playerEntity).GridEntityId;
gridId = xformQuery.GetComponent(playerEntity).GridUid;
break;
case 1:
if (!EntityUid.TryParse(args[0], out var id))

4
Content.Server/Construction/Commands/TileReplaceCommand.cs
View File

@@ -21,7 +21,7 @@ sealed class TileReplaceCommand : IConsoleCommand
{
var player = shell.Player as IPlayerSession;
var entityManager = IoCManager.Resolve<IEntityManager>();
EntityUid gridId;
EntityUid? gridId;
string tileIdA = "";
string tileIdB = "";
@@ -34,7 +34,7 @@ sealed class TileReplaceCommand : IConsoleCommand
return;
}
gridId = entityManager.GetComponent<TransformComponent>(playerEntity).GridEntityId;
gridId = entityManager.GetComponent<TransformComponent>(playerEntity).GridUid;
tileIdA = args[0];
tileIdB = args[1];
break;

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

@@ -24,7 +24,7 @@ namespace Content.Server.Construction.Commands
{
var player = shell.Player as IPlayerSession;
var entityManager = IoCManager.Resolve<IEntityManager>();
EntityUid gridId;
EntityUid? gridId;
switch (args.Length)
{
@@ -35,7 +35,7 @@ namespace Content.Server.Construction.Commands
return;
}
gridId = entityManager.GetComponent<TransformComponent>(playerEntity).GridEntityId;
gridId = entityManager.GetComponent<TransformComponent>(playerEntity).GridUid;
break;
case 1:
if (!EntityUid.TryParse(args[0], out var id))

5
Content.Server/Construction/Conditions/ComponentInTile.cs
View File

@@ -43,8 +43,11 @@ namespace Content.Server.Construction.Conditions
var type = IoCManager.Resolve<IComponentFactory>().GetRegistration(Component).Type;
var transform = entityManager.GetComponent<TransformComponent>(uid);
if (transform.GridUid == null)
return false;
var indices = transform.Coordinates.ToVector2i(entityManager, IoCManager.Resolve<IMapManager>());
var entities = indices.GetEntitiesInTile(transform.GridEntityId, LookupFlags.Approximate | LookupFlags.Anchored, EntitySystem.Get<EntityLookupSystem>());
var entities = indices.GetEntitiesInTile(transform.GridUid.Value, LookupFlags.Approximate | LookupFlags.Anchored, EntitySystem.Get<EntityLookupSystem>());
foreach (var ent in entities)
{