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

Change NextTube in DisposalTubeComponent to consider multiple tube (#1851)

Browse Source 
Co-authored-by: Julian Giebel <j.giebel@netrocks.info>
This commit is contained in:
Julian Giebel
2020-08-22 13:55:58 +02:00
committed by GitHub
parent 8e54ea42e6
commit 265afc9929
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,21 +69,11 @@ namespace Content.Server.GameObjects.Components.Disposal
{ {
var nextDirection = NextDirection(holder); var nextDirection = NextDirection(holder);
var snapGrid = Owner.GetComponent<SnapGridComponent>(); var snapGrid = Owner.GetComponent<SnapGridComponent>();
var oppositeDirection = new Angle(nextDirection.ToAngle().Theta + Math.PI).GetDir();
var tube = snapGrid var tube = snapGrid
.GetInDir(nextDirection) .GetInDir(nextDirection)
.Select(x => x.TryGetComponent(out IDisposalTubeComponent? c) ? c : null) .Select(x => x.TryGetComponent(out IDisposalTubeComponent? c) ? c : null)
.FirstOrDefault(x => x != null && x != this); .FirstOrDefault(x => x != null && x != this && x.CanConnect(oppositeDirection, this));
if (tube == null)
{
return null;
}
var oppositeDirection = new Angle(nextDirection.ToAngle().Theta + Math.PI).GetDir();
if (!tube.CanConnect(oppositeDirection, this))
{
return null;
}
return tube; return tube;
} }