From a85a5029d391e252210960ff457df45a799d9c07 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sat, 28 Jan 2023 12:39:51 -0500
Subject: [PATCH] fix artifact scanning bug (#13767)
---
.../Effects/Systems/RandomTeleportArtifactSystem.cs | 6 ++----
.../XenoArtifacts/Effects/Systems/ShuffleArtifactSystem.cs | 3 ++-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/RandomTeleportArtifactSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/RandomTeleportArtifactSystem.cs
index c366a33e82..cdfa2ca905 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/RandomTeleportArtifactSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/RandomTeleportArtifactSystem.cs
@@ -6,13 +6,11 @@ using Robust.Shared.Random;
namespace Content.Server.Xenoarchaeology.XenoArtifacts.Effects.Systems;
-///
-/// This handles...
-///
public sealed class RandomTeleportArtifactSystem : EntitySystem
{
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly SharedPopupSystem _popup = default!;
+ [Dependency] private readonly SharedTransformSystem _xform = default!;
///
public override void Initialize()
@@ -25,6 +23,6 @@ public sealed class RandomTeleportArtifactSystem : EntitySystem
var xform = Transform(uid);
_popup.PopupCoordinates(Loc.GetString("blink-artifact-popup"), xform.Coordinates, PopupType.Medium);
- xform.Coordinates = xform.Coordinates.Offset(_random.NextVector2(component.Range));
+ _xform.SetCoordinates(xform, xform.Coordinates.Offset(_random.NextVector2(component.Range)));
}
}
diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ShuffleArtifactSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ShuffleArtifactSystem.cs
index ed1eda92c3..052fceacad 100644
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ShuffleArtifactSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ShuffleArtifactSystem.cs
@@ -10,6 +10,7 @@ public sealed class ShuffleArtifactSystem : EntitySystem
{
[Dependency] private readonly EntityLookupSystem _lookup = default!;
[Dependency] private readonly IRobustRandom _random = default!;
+ [Dependency] private readonly SharedTransformSystem _xform = default!;
///
public override void Initialize()
@@ -37,7 +38,7 @@ public sealed class ShuffleArtifactSystem : EntitySystem
foreach (var xform in toShuffle)
{
- xform.Coordinates = _random.PickAndTake(allCoords);
+ _xform.SetCoordinates(xform, _random.PickAndTake(allCoords));
}
}
}