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

Fix containment fields finding one another (#5094)

Browse Source
This commit is contained in:
Saphire Lattice
2021-10-31 20:39:36 +07:00
committed by GitHub
parent 0865409521
commit fdf67d8ee6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Singularity/Components/ContainmentFieldConnection.cs
View File

@@ -62,7 +62,7 @@ namespace Content.Server.Singularity.Components
} }
containmentFieldComponent.Parent = this; containmentFieldComponent.Parent = this;
newEnt.Transform.WorldRotation = dirVec.ToWorldAngle(); newEnt.Transform.WorldRotation = generator1.Owner.Transform.WorldRotation + dirVec.ToWorldAngle();
_fields.Add(newEnt); _fields.Add(newEnt);
currentOffset += dirVec; currentOffset += dirVec;

2
Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs
View File

@@ -95,7 +95,7 @@ namespace Content.Server.Singularity.Components
{ {
if (_connection1?.Item1 == direction || _connection2?.Item1 == direction) continue; if (_connection1?.Item1 == direction || _connection2?.Item1 == direction) continue;
var dirVec = direction.ToVec(); var dirVec = Owner.Transform.WorldRotation.RotateVec(direction.ToVec());
var ray = new CollisionRay(Owner.Transform.WorldPosition, dirVec, (int) CollisionGroup.MobMask); var ray = new CollisionRay(Owner.Transform.WorldPosition, dirVec, (int) CollisionGroup.MobMask);
var rawRayCastResults = EntitySystem.Get<SharedPhysicsSystem>().IntersectRay(Owner.Transform.MapID, ray, 4.5f, Owner, false); var rawRayCastResults = EntitySystem.Get<SharedPhysicsSystem>().IntersectRay(Owner.Transform.MapID, ray, 4.5f, Owner, false);