tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Connect to the closest ExtensionCable instead of the first (#17271)

Browse Source
This commit is contained in:
Alex Nordlund
2023-06-15 03:31:14 +02:00
committed by GitHub
parent 43ea9d2329
commit 29297970e4
2 changed files with 49 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,5 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Server.Power.Components;
using Robust.Shared.Map;
using Robust.Shared.Physics;
@@ -247,24 +248,42 @@ namespace Content.Server.Power.EntitySystems
var coordinates = xform.Coordinates;
var nearbyEntities = grid.GetCellsInSquareArea(coordinates, (int) Math.Ceiling(range / grid.TileSize));
var cableQuery = GetEntityQuery<ExtensionCableProviderComponent>();
var metaQuery = GetEntityQuery<MetaDataComponent>();
var xformQuery = GetEntityQuery<TransformComponent>();
ExtensionCableProviderComponent? closestCandidate = null;
var closestDistanceFound = float.MaxValue;
foreach (var entity in nearbyEntities)
{
if (entity == owner || !EntityManager.TryGetComponent<ExtensionCableProviderComponent?>(entity, out var provider)) continue;
if (entity == owner || !cableQuery.TryGetComponent(entity, out var provider) || !provider.Connectable)
continue;
if (EntityManager.IsQueuedForDeletion(entity)) continue;
if (EntityManager.IsQueuedForDeletion(entity))
continue;
if (MetaData(entity).EntityLifeStage > EntityLifeStage.MapInitialized) continue;
if (!metaQuery.TryGetComponent(entity, out var meta) || meta.EntityLifeStage > EntityLifeStage.MapInitialized)
continue;
if (!provider.Connectable) continue;
// Find the closest provider
if (!xformQuery.TryGetComponent(entity, out var entityXform))
continue;
var distance = (entityXform.LocalPosition - xform.LocalPosition).Length;
if (distance >= closestDistanceFound)
continue;
if ((Transform(entity).LocalPosition - xform.LocalPosition).Length > Math.Min(range, provider.TransferRange)) continue;
closestCandidate = provider;
closestDistanceFound = distance;
}
foundProvider = provider;
// Make sure the provider is in range before claiming success
if (closestCandidate != null && closestDistanceFound <= Math.Min(range, closestCandidate.TransferRange))
{
foundProvider = closestCandidate;
return true;
}
foundProvider = default;
foundProvider = null;
return false;
}