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

Fix not checking both perspectives of a disposals tube connection (#1947)

Browse Source 
* Fix not checking both perspectives of a disposals tube connection

* Good night LINQ

Switch to Reactive whence

* by god
This commit is contained in:
DrSmugleaf
2020-08-29 13:13:08 +02:00
committed by GitHub
parent a57c5265be
commit c37c39fe3c
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs
View File

@@ -69,14 +69,30 @@ namespace Content.Server.GameObjects.Components.Disposal
var nextDirection = NextDirection(holder);
var snapGrid = Owner.GetComponent<SnapGridComponent>();
var oppositeDirection = new Angle(nextDirection.ToAngle().Theta + Math.PI).GetDir();
var tube = snapGrid
.GetInDir(nextDirection)
.Select(x => x.TryGetComponent(out IDisposalTubeComponent? c) ? c : null)
.FirstOrDefault(x => x != null && x != this && x.CanConnect(oppositeDirection, this));
foreach (var entity in snapGrid.GetInDir(nextDirection))
{
if (!entity.TryGetComponent(out IDisposalTubeComponent? tube))
{
continue;
}
if (!tube.CanConnect(oppositeDirection, this))
{
continue;
}
if (!CanConnect(nextDirection, tube))
{
continue;
}
return tube;
}
return null;
}
public bool Remove(DisposalHolderComponent holder)
{
var removed = Contents.Remove(holder.Owner);