From 0b8f6c81db6887d0a9f7de1bb94fda22fd6cd938 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Thu, 17 Sep 2026 23:57:21 +1000 Subject: [PATCH] Fix engine proxy methods (#46057) --- Content.Shared/Botany/Traits/Systems/PlantTraitKudzuSystem.cs | 2 +- .../CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs | 2 +- Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs | 2 +- Content.Shared/Tabletop/SharedTabletopSystem.cs | 2 +- Content.Shared/Trigger/Systems/TriggerSystem.Spawn.cs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Content.Shared/Botany/Traits/Systems/PlantTraitKudzuSystem.cs b/Content.Shared/Botany/Traits/Systems/PlantTraitKudzuSystem.cs index 3fd2fac4b7..7e348a0f3b 100644 --- a/Content.Shared/Botany/Traits/Systems/PlantTraitKudzuSystem.cs +++ b/Content.Shared/Botany/Traits/Systems/PlantTraitKudzuSystem.cs @@ -27,7 +27,7 @@ public sealed partial class PlantTraitKudzuSystem : EntitySystem // Handle kudzu transformation. if (trayComp.WeedLevel >= ent.Comp.WeedLevelThreshold) { - EntityManager.PredictedSpawn(ent.Comp.KudzuPrototype, _transform.GetMapCoordinates(ent.Owner)); + PredictedSpawn(ent.Comp.KudzuPrototype, _transform.GetMapCoordinates(ent.Owner)); RemComp(ent.Owner); _plantHolder.KillPlant(ent.Owner); } diff --git a/Content.Shared/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs b/Content.Shared/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs index 05dc788d3a..fc5e644144 100644 --- a/Content.Shared/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs +++ b/Content.Shared/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs @@ -93,7 +93,7 @@ public sealed partial class LogProbeCartridgeSystem : EntitySystem ent.Comp.NextPrintAllowed = _timing.CurTime + ent.Comp.PrintCooldown; - var paper = EntityManager.PredictedSpawn(ent.Comp.PaperPrototype, _transform.GetMapCoordinates(user)); + var paper = PredictedSpawn(ent.Comp.PaperPrototype, _transform.GetMapCoordinates(user)); _label.Label(paper, ent.Comp.EntityName); // label it for easy identification _audio.PlayEntity(ent.Comp.PrintSound, user, paper); diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs index 51e88a13ef..b4bd2aee2a 100644 --- a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs +++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs @@ -161,7 +161,7 @@ public sealed partial class IngestionSystem foreach (var trash in trashes) { - var spawnedTrash = EntityManager.PredictedSpawn(trash, position); + var spawnedTrash = PredictedSpawn(trash, position); // If the user is holding the item if (!pickup) diff --git a/Content.Shared/Tabletop/SharedTabletopSystem.cs b/Content.Shared/Tabletop/SharedTabletopSystem.cs index 751d8c10ba..4a1ec4be6e 100644 --- a/Content.Shared/Tabletop/SharedTabletopSystem.cs +++ b/Content.Shared/Tabletop/SharedTabletopSystem.cs @@ -94,7 +94,7 @@ public abstract partial class SharedTabletopSystem : EntitySystem var meta = MetaData(handEnt.Value); var protoId = meta.EntityPrototype?.ID; - var hologram = EntityManager.PredictedSpawn(protoId, session.Position.Offset(-1, 0)); + var hologram = PredictedSpawn(protoId, session.Position.Offset(-1, 0)); // Make sure the entity can be dragged and can be removed, move it into the board game world and add it to the Entities hashmap. EnsureComp(hologram); diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Spawn.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Spawn.cs index 0bc1cffe66..cc107f29c9 100644 --- a/Content.Shared/Trigger/Systems/TriggerSystem.Spawn.cs +++ b/Content.Shared/Trigger/Systems/TriggerSystem.Spawn.cs @@ -72,7 +72,7 @@ public sealed partial class TriggerSystem { var mapCoords = _transform.GetMapCoordinates(target); if (predicted) - EntityManager.PredictedSpawn(proto, mapCoords); + PredictedSpawn(proto, mapCoords); else if (_net.IsServer) Spawn(proto, mapCoords); }