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

Change doors to ignore static entities when closing (#7646)

Browse Source
This commit is contained in:
ShadowCommander
2022-04-19 06:45:36 -07:00
committed by GitHub
parent 2d851a8f87
commit 4571af1e6e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Doors/Systems/SharedDoorSystem.cs
View File

@@ -170,7 +170,7 @@ public abstract class SharedDoorSystem : EntitySystem
protected virtual void OnActivate(EntityUid uid, DoorComponent door, ActivateInWorldEvent args) protected virtual void OnActivate(EntityUid uid, DoorComponent door, ActivateInWorldEvent args)
{ {
// avoid client-mispredicts, as the server will definitely handle this event // avoid client-mispredicts, as the server will definitely handle this event
args.Handled = true; args.Handled = true;
} }
private void OnExamine(EntityUid uid, DoorComponent door, ExaminedEvent args) private void OnExamine(EntityUid uid, DoorComponent door, ExaminedEvent args)
@@ -433,7 +433,7 @@ public abstract class SharedDoorSystem : EntitySystem
if (!otherPhysics.CanCollide) if (!otherPhysics.CanCollide)
continue; continue;
if ((physics.CollisionMask & otherPhysics.CollisionLayer) == 0 if (otherPhysics.BodyType == BodyType.Static || (physics.CollisionMask & otherPhysics.CollisionLayer) == 0
&& (otherPhysics.CollisionMask & physics.CollisionLayer) == 0) && (otherPhysics.CollisionMask & physics.CollisionLayer) == 0)
continue; continue;