fix mirror server crashes (#28318)

This commit is contained in:
Nemanja
2024-05-27 11:50:05 -04:00
committed by GitHub
parent 5a59c6f262
commit 224af2af0e
2 changed files with 18 additions and 8 deletions

View File

@@ -4,7 +4,6 @@ using Content.Shared.Humanoid.Markings;
using Content.Shared.Interaction;
using Content.Shared.UserInterface;
using Robust.Shared.Serialization;
using Robust.Shared.Utility;
namespace Content.Shared.MagicMirror;
@@ -18,6 +17,7 @@ public abstract class SharedMagicMirrorSystem : EntitySystem
base.Initialize();
SubscribeLocalEvent<MagicMirrorComponent, AfterInteractEvent>(OnMagicMirrorInteract);
SubscribeLocalEvent<MagicMirrorComponent, BeforeActivatableUIOpenEvent>(OnBeforeUIOpen);
SubscribeLocalEvent<MagicMirrorComponent, ActivatableUIOpenAttemptEvent>(OnAttemptOpenUI);
SubscribeLocalEvent<MagicMirrorComponent, BoundUserInterfaceCheckRangeEvent>(OnMirrorRangeCheck);
}
@@ -26,10 +26,8 @@ public abstract class SharedMagicMirrorSystem : EntitySystem
if (!args.CanReach || args.Target == null)
return;
if (!UISystem.TryOpenUi(mirror.Owner, MagicMirrorUiKey.Key, args.User))
return;
UpdateInterface(mirror, args.Target.Value, mirror);
UISystem.TryOpenUi(mirror.Owner, MagicMirrorUiKey.Key, args.User);
}
private void OnMirrorRangeCheck(EntityUid uid, MagicMirrorComponent component, ref BoundUserInterfaceCheckRangeEvent args)
@@ -37,17 +35,27 @@ public abstract class SharedMagicMirrorSystem : EntitySystem
if (args.Result == BoundUserInterfaceRangeResult.Fail)
return;
DebugTools.Assert(component.Target != null && Exists(component.Target));
if (component.Target == null || !Exists(component.Target))
{
component.Target = null;
args.Result = BoundUserInterfaceRangeResult.Fail;
return;
}
if (!_interaction.InRangeUnobstructed(uid, component.Target.Value))
args.Result = BoundUserInterfaceRangeResult.Fail;
}
private void OnAttemptOpenUI(EntityUid uid, MagicMirrorComponent component, ref ActivatableUIOpenAttemptEvent args)
{
var user = component.Target ?? args.User;
if (!HasComp<HumanoidAppearanceComponent>(user))
args.Cancel();
}
private void OnBeforeUIOpen(Entity<MagicMirrorComponent> ent, ref BeforeActivatableUIOpenEvent args)
{
if (args.User != ent.Comp.Target && ent.Comp.Target != null)
return;
UpdateInterface(ent, args.User, ent);
}
@@ -55,6 +63,7 @@ public abstract class SharedMagicMirrorSystem : EntitySystem
{
if (!TryComp<HumanoidAppearanceComponent>(targetUid, out var humanoid))
return;
component.Target ??= targetUid;
var hair = humanoid.MarkingSet.TryGetCategory(MarkingCategories.Hair, out var hairMarkings)

View File

@@ -19,6 +19,7 @@
changeSlotTime: 0
- type: ActivatableUI
key: enum.MagicMirrorUiKey.Key
singleUser: true
- type: UserInterface
interfaces:
enum.MagicMirrorUiKey.Key: