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

Remove Explicit GridId References (#8315)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Acruid
2022-06-11 18:54:41 -07:00
committed by GitHub
parent 846321cebb
commit 4f9be42f40
131 changed files with 531 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Power/EntitySystems/CableSystem.Placer.cs
View File

@@ -2,6 +2,7 @@ using Content.Server.Power.Components;
using Content.Server.Stack;
using Content.Shared.Interaction;
using Content.Shared.Maps;
using Robust.Shared.Map;
namespace Content.Server.Power.EntitySystems;
@@ -18,7 +19,7 @@ public sealed partial class CableSystem
if (component.CablePrototypeId == null) return;
if(!_mapManager.TryGetGrid(args.ClickLocation.GetGridId(EntityManager), out var grid))
if(!_mapManager.TryGetGrid(args.ClickLocation.GetGridEntityId(EntityManager), out var grid))
return;
var snapPos = grid.TileIndicesFor(args.ClickLocation);

2
Content.Server/Power/EntitySystems/CableVisSystem.cs
View File

@@ -29,7 +29,7 @@ namespace Content.Server.Power.EntitySystems
return;
var transform = Transform(uid);
if (!_mapManager.TryGetGrid(transform.GridID, out var grid))
if (!_mapManager.TryGetGrid(transform.GridEntityId, out var grid))
return;
var mask = WireVisDirFlags.None;

6
Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
View File

@@ -48,7 +48,7 @@ namespace Content.Server.Power.EntitySystems
var xform = Transform(uid);
// If grid deleting no need to update power.
if (_mapManager.TryGetGrid(xform.GridID, out var grid))
if (_mapManager.TryGetGrid(xform.GridEntityId, out var grid))
{
if (MetaData(grid.GridEntityId).EntityLifeStage > EntityLifeStage.MapInitialized) return;
}
@@ -120,7 +120,7 @@ namespace Content.Server.Power.EntitySystems
var xform = Transform(owner);
var coordinates = xform.Coordinates;
if (!_mapManager.TryGetGrid(xform.GridID, out var grid))
if (!_mapManager.TryGetGrid(xform.GridEntityId, out var grid))
yield break;
var nearbyEntities = grid.GetCellsInSquareArea(coordinates, (int) Math.Ceiling(range / grid.TileSize));
@@ -238,7 +238,7 @@ namespace Content.Server.Power.EntitySystems
private bool TryFindAvailableProvider(EntityUid owner, float range, [NotNullWhen(true)] out ExtensionCableProviderComponent? foundProvider, TransformComponent? xform = null)
{
if (!Resolve(owner, ref xform) || !_mapManager.TryGetGrid(xform.GridID, out var grid))
if (!Resolve(owner, ref xform) || !_mapManager.TryGetGrid(xform.GridEntityId, out var grid))
{
foundProvider = null;
return false;

4
Content.Server/Power/NodeGroups/ApcNet.cs
View File

@@ -21,7 +21,7 @@ namespace Content.Server.Power.NodeGroups
void QueueNetworkReconnect();
GridId? GridId { get; }
EntityUid? GridId { get; }
}
[NodeGroup(NodeGroupID.Apc)]
@@ -41,7 +41,7 @@ namespace Content.Server.Power.NodeGroups
private IEnumerable<ApcPowerReceiverComponent> AllReceivers =>
Providers.SelectMany(provider => provider.LinkedReceivers);
GridId? IApcNet.GridId => GridId;
EntityUid? IApcNet.GridId => GridId;
[ViewVariables]
public PowerState.Network NetworkNode { get; } = new();