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

Fix foldable mispredict (#14919)

Browse Source
This commit is contained in:
Nemanja
2023-03-28 01:43:36 -04:00
committed by GitHub
parent 4bc04f1bc5
commit 62e5ef8041
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Server/Foldable/FoldableSystem.cs
View File

@@ -3,7 +3,6 @@ using Content.Server.Buckle.Systems;
using Content.Server.Storage.Components;
using Content.Shared.Buckle.Components;
using Content.Shared.Foldable;
using Content.Shared.Storage.Components;
using Content.Shared.Verbs;
using JetBrains.Annotations;
using Robust.Shared.Containers;
@@ -21,18 +20,9 @@ namespace Content.Server.Foldable
{
base.Initialize();
SubscribeLocalEvent<FoldableComponent, StorageOpenAttemptEvent>(OnFoldableOpenAttempt);
SubscribeLocalEvent<FoldableComponent, GetVerbsEvent<AlternativeVerb>>(AddFoldVerb);
SubscribeLocalEvent<FoldableComponent, StoreMobInItemContainerAttemptEvent>(OnStoreThisAttempt);
}
private void OnFoldableOpenAttempt(EntityUid uid, FoldableComponent component, ref StorageOpenAttemptEvent args)
{
if (component.IsFolded)
args.Cancelled = true;
}
public bool TryToggleFold(EntityUid uid, FoldableComponent comp)
{
return TrySetFolded(uid, comp, !comp.IsFolded);
@@ -78,6 +68,7 @@ namespace Content.Server.Foldable
/// <summary>
/// Set the folded state of the given <see cref="FoldableComponent"/>
/// </summary>
/// <param name="uid"></param>
/// <param name="component"></param>
/// <param name="folded">If true, the component will become folded, else unfolded</param>
public override void SetFolded(EntityUid uid, FoldableComponent component, bool folded)
@@ -88,14 +79,6 @@ namespace Content.Server.Foldable
_buckle.StrapSetEnabled(uid, !component.IsFolded);
}
public void OnStoreThisAttempt(EntityUid uid, FoldableComponent comp, ref StoreMobInItemContainerAttemptEvent args)
{
args.Handled = true;
if (comp.IsFolded)
args.Cancelled = true;
}
#region Verb
private void AddFoldVerb(EntityUid uid, FoldableComponent component, GetVerbsEvent<AlternativeVerb> args)