Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Inflatable wall fix #8409

Merged
merged 2 commits into from
May 25, 2022
Merged

Inflatable wall fix #8409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
367feba
adds a check for canreach in SpawnAfterInteract
vulppine May 24, 2022
9fd172c
adds a check for the new field
vulppine May 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Content.Server/Engineering/Components/SpawnAfterInteractComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ public sealed class SpawnAfterInteractComponent : Component
[DataField("prototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
public string? Prototype { get; }

[ViewVariables]
[DataField("ignoreDistance")]
public bool IgnoreDistance { get; }

[ViewVariables]
[DataField("doAfter")]
public float DoAfterTime = 0;
Expand Down
2 changes: 2 additions & 0 deletions Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ public override void Initialize()

private async void HandleAfterInteract(EntityUid uid, SpawnAfterInteractComponent component, AfterInteractEvent args)
{
if (!args.CanReach && !component.IgnoreDistance)
return;
if (string.IsNullOrEmpty(component.Prototype))
return;
if (!_mapManager.TryGetGrid(args.ClickLocation.GetGridId(EntityManager), out var grid))
Expand Down