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

Block interactions with subfloor entities (#6732)

Browse Source
This commit is contained in:
Leon Friedrich
2022-02-16 15:34:31 +13:00
committed by GitHub
parent 1719384b3c
commit 9d422d0762
5 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Shared/SubFloor/SharedSubFloorHideSystem.cs
View File

@@ -1,4 +1,5 @@
using Content.Shared.Interaction;
using Content.Shared.Interaction.Events;
using Content.Shared.Maps;
using JetBrains.Annotations;
using Robust.Shared.Map;
@@ -26,7 +27,7 @@ namespace Content.Shared.SubFloor
SubscribeLocalEvent<SubFloorHideComponent, ComponentStartup>(OnSubFloorStarted);
SubscribeLocalEvent<SubFloorHideComponent, ComponentShutdown>(OnSubFloorTerminating);
SubscribeLocalEvent<SubFloorHideComponent, AnchorStateChangedEvent>(HandleAnchorChanged);
SubscribeLocalEvent<SubFloorHideComponent, InteractUsingEvent>(OnInteractionAttempt);
SubscribeLocalEvent<SubFloorHideComponent, GettingInteractedWithAttemptEvent>(OnInteractionAttempt);
}
public override void Shutdown()
@@ -37,10 +38,11 @@ namespace Content.Shared.SubFloor
_mapManager.TileChanged -= MapManagerOnTileChanged;
}
private void OnInteractionAttempt(EntityUid uid, SubFloorHideComponent component, InteractUsingEvent args)
private void OnInteractionAttempt(EntityUid uid, SubFloorHideComponent component, GettingInteractedWithAttemptEvent args)
{
// TODO make this use an interact attempt event or something. Handling an InteractUsing is not going to work in general.
args.Handled = component.IsUnderCover;
// No interactions with entities hidden under floor tiles.
if (component.BlockInteractions && component.IsUnderCover)
args.Cancel();
}
private void OnSubFloorStarted(EntityUid uid, SubFloorHideComponent component, ComponentStartup _)