Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix improper prediction on unpryable doors (#24738)

Browse Source 
Fix improper prediction on unpryable doors.

Entities that had CanPry to false on their components would get
improperly predicted as pryable on the client because the check was only
preformed on the server. Same problem existed for welded doors. Moved
the check from server to shared.
This commit is contained in:
nikthechampiongr
2024-01-30 20:03:15 +02:00
committed by GitHub
parent ff7f7881c8
commit 9bebdf5706
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Doors/Systems/DoorSystem.cs
View File

@@ -28,8 +28,6 @@ public sealed class DoorSystem : SharedDoorSystem
{
base.Initialize();
SubscribeLocalEvent<DoorComponent, BeforePryEvent>(OnBeforeDoorPry);
SubscribeLocalEvent<DoorComponent, WeldableAttemptEvent>(OnWeldAttempt);
SubscribeLocalEvent<DoorComponent, WeldableChangedEvent>(OnWeldChanged);
SubscribeLocalEvent<DoorComponent, GotEmaggedEvent>(OnEmagged);
@@ -124,12 +122,6 @@ public sealed class DoorSystem : SharedDoorSystem
else if (component.State == DoorState.Welded)
SetState(uid, DoorState.Closed, component);
}
private void OnBeforeDoorPry(EntityUid id, DoorComponent door, ref BeforePryEvent args)
{
if (door.State == DoorState.Welded || !door.CanPry)
args.Cancelled = true;
}
#endregion