Make radio jammer block suit sensors (#26046)
* Make radio jammer block suit sensors * Fix stupid Use CancellableEventArgs instead of doing what the hell I was doing before. * Address Reviews. Change the event from a CancellableEntityEventArgs to a ByRefEvent.
This commit is contained in:
@@ -87,3 +87,9 @@ public sealed partial class SuitSensorComponent : Component
|
||||
[DataField, ViewVariables]
|
||||
public bool PreviousControlsLocked = false;
|
||||
}
|
||||
|
||||
[ByRefEvent]
|
||||
public record struct SuitSensorsSendAttemptEvent
|
||||
{
|
||||
public bool Cancelled;
|
||||
};
|
||||
|
||||
@@ -73,6 +73,11 @@ public sealed class SuitSensorSystem : EntitySystem
|
||||
// TODO: This would cause imprecision at different tick rates.
|
||||
sensor.NextUpdate = curTime + sensor.UpdateRate;
|
||||
|
||||
var canEv = new SuitSensorsSendAttemptEvent();
|
||||
RaiseLocalEvent(uid, ref canEv);
|
||||
if (canEv.Cancelled)
|
||||
continue;
|
||||
|
||||
// get sensor status
|
||||
var status = GetSensorState(uid, sensor);
|
||||
if (status == null)
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using Content.Server.Medical.SuitSensors;
|
||||
using Content.Server.Popups;
|
||||
using Content.Server.Power.EntitySystems;
|
||||
using Content.Server.PowerCell;
|
||||
@@ -23,6 +24,7 @@ public sealed class JammerSystem : EntitySystem
|
||||
SubscribeLocalEvent<ActiveRadioJammerComponent, PowerCellChangedEvent>(OnPowerCellChanged);
|
||||
SubscribeLocalEvent<RadioJammerComponent, ExaminedEvent>(OnExamine);
|
||||
SubscribeLocalEvent<RadioSendAttemptEvent>(OnRadioSendAttempt);
|
||||
SubscribeLocalEvent<SuitSensorComponent, SuitSensorsSendAttemptEvent>(OnSensorSendAttempt);
|
||||
}
|
||||
|
||||
public override void Update(float frameTime)
|
||||
@@ -76,15 +78,33 @@ public sealed class JammerSystem : EntitySystem
|
||||
|
||||
private void OnRadioSendAttempt(ref RadioSendAttemptEvent args)
|
||||
{
|
||||
var source = Transform(args.RadioSource).Coordinates;
|
||||
if (ShouldCancelSend(args.RadioSource))
|
||||
{
|
||||
args.Cancelled = true;
|
||||
}
|
||||
}
|
||||
|
||||
private void OnSensorSendAttempt(EntityUid uid, SuitSensorComponent comp, ref SuitSensorsSendAttemptEvent args)
|
||||
{
|
||||
if (ShouldCancelSend(uid))
|
||||
{
|
||||
args.Cancelled = true;
|
||||
}
|
||||
}
|
||||
|
||||
private bool ShouldCancelSend(EntityUid sourceUid)
|
||||
{
|
||||
var source = Transform(sourceUid).Coordinates;
|
||||
var query = EntityQueryEnumerator<ActiveRadioJammerComponent, RadioJammerComponent, TransformComponent>();
|
||||
|
||||
while (query.MoveNext(out _, out _, out var jam, out var transform))
|
||||
{
|
||||
if (source.InRange(EntityManager, _transform, transform.Coordinates, jam.Range))
|
||||
{
|
||||
args.Cancelled = true;
|
||||
return;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user