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

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

@@ -19,7 +19,7 @@ public sealed partial class CableSystem
if (component.CablePrototypeId == null) return;
if(!_mapManager.TryGetGrid(args.ClickLocation.GetGridEntityId(EntityManager), out var grid))
if(!_mapManager.TryGetGrid(args.ClickLocation.GetGridUid(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.GridEntityId, out var grid))
if (!_mapManager.TryGetGrid(transform.GridUid, 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.GridEntityId, out var grid))
if (_mapManager.TryGetGrid(xform.GridUid, 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.GridEntityId, out var grid))
if (!_mapManager.TryGetGrid(xform.GridUid, 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.GridEntityId, out var grid))
if (!Resolve(owner, ref xform) || !_mapManager.TryGetGrid(xform.GridUid, out var grid))
{
foundProvider = null;
return false;

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

@@ -46,9 +46,9 @@ namespace Content.Server.Power.NodeGroups
[ViewVariables]
public PowerState.Network NetworkNode { get; } = new();
public override void Initialize(Node sourceNode)
public override void Initialize(Node sourceNode, IEntityManager? entMan = null)
{
base.Initialize(sourceNode);
base.Initialize(sourceNode, entMan);
_powerNetSystem.InitApcNet(this);
}

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

@@ -37,9 +37,9 @@ namespace Content.Server.Power.NodeGroups
[ViewVariables]
public PowerState.Network NetworkNode { get; } = new();
public override void Initialize(Node sourceNode)
public override void Initialize(Node sourceNode, IEntityManager? entMan = null)
{
base.Initialize(sourceNode);
base.Initialize(sourceNode, entMan);
_powerNetSystem.InitPowerNet(this);
}