fix

Rxup · Oct 26, 2023 · c63eef7 · c63eef7
1 parent dfe7e35
commit c63eef7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -227,6 +227,7 @@ public async Task SpawnAndDeleteEntityCountTest()
                 //Backmen
                 "FugitiveCountdown", // Fugitive.
                 "ShipyardConsole", // Shipyard Console
+                "Eftpos", // attach to bank account on mapinit
 
 
                 // Spawner entities

diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
@@ -95,14 +95,6 @@ private void InitializeEmergencyConsole()
         SubscribeLocalEvent<EscapePodComponent, EntityUnpausedEvent>(OnEscapeUnpaused);
     }
 
-    // Corvax-Hijack-Start
-    private void OnEmagged(EntityUid uid, EmergencyShuttleConsoleComponent component, ref GotEmaggedEvent args)
-    {
-        _logger.Add(LogType.EmergencyShuttle, LogImpact.Extreme, $"{ToPrettyString(args.UserUid):player} emagged shuttle console for early launch");
-        EarlyLaunch();
-    }
-    // Corvax-Hijack-End
-
     private void OnEmergencyOpenAttempt(EntityUid uid, EmergencyShuttleConsoleComponent component, ActivatableUIOpenAttemptEvent args)
     {
         // I'm hoping ActivatableUI checks it's open before allowing these messages.

diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMagnetTriggerSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMagnetTriggerSystem.cs
@@ -34,8 +34,8 @@ public override void Update(float frameTime)
             if (!magboot.On)
                 continue;
 
-            var artiQuery = EntityQueryEnumerator<ArtifactMagnetTriggerComponent, TransformComponent>();
-            while (artiQuery.MoveNext(out var artifactUid, out var trigger, out var xform))
+            var artiQuery = EntityQueryEnumerator<ArtifactMagnetTriggerComponent, TransformComponent, ArtifactComponent>(); // backmen: fix spam errors
+            while (artiQuery.MoveNext(out var artifactUid, out var trigger, out var xform, out _))
             {
                 if (!magXform.Coordinates.TryDistance(EntityManager, xform.Coordinates, out var distance))
                     continue;