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

Fix firelock door init (#6384)

Browse Source
This commit is contained in:
Leon Friedrich
2022-01-30 17:47:24 +13:00
committed by GitHub
parent c30e4b36db
commit 1914560773
6 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,8 +46,8 @@ public abstract class SharedDoorSystem : EntitySystem
{
base.Initialize();
SubscribeLocalEvent<DoorComponent, ComponentStartup>(OnStartup);
SubscribeLocalEvent<DoorComponent, ComponentShutdown>(OnShutdown);
SubscribeLocalEvent<DoorComponent, ComponentInit>(OnInit);
SubscribeLocalEvent<DoorComponent, ComponentRemove>(OnRemove);
SubscribeLocalEvent<DoorComponent, ComponentGetState>(OnGetState);
SubscribeLocalEvent<DoorComponent, ComponentHandleState>(OnHandleState);
@@ -59,26 +59,22 @@ public abstract class SharedDoorSystem : EntitySystem
SubscribeLocalEvent<DoorComponent, PreventCollideEvent>(PreventCollision);
}
private void OnStartup(EntityUid uid, DoorComponent door, ComponentStartup args)
private void OnInit(EntityUid uid, DoorComponent door, ComponentInit args)
{
// if the door state is not standard (i.e., door starts open), make sure collision & occlusion are properly set.
if (door.StartOpen)
if (door.State == DoorState.Open)
{
// disable occluder & physics
OnPartialOpen(uid, door);
// THEN set the correct state, inc disabling partial = true
SetState(uid, DoorState.Open, door);
// The airlock component may schedule an auto-close for this door during the SetState.
// Give the door is supposed to start open, let's prevent any auto-closing that might occur.
door.NextStateChange = null;
if (TryComp(uid, out PhysicsComponent? physics))
physics.CanCollide = false;
if (door.Occludes && TryComp(uid, out OccluderComponent? occluder))
occluder.Enabled = false;
}
UpdateAppearance(uid, door);
}
private void OnShutdown(EntityUid uid, DoorComponent door, ComponentShutdown args)
private void OnRemove(EntityUid uid, DoorComponent door, ComponentRemove args)
{
_activeDoors.Remove(door);
}