Skip to content

Fixes for engine SpawnNextToOrDrop changes #44204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SnappingOpossum wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes for engine SpawnNextToOrDrop changes #44204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eed64e2
Fixes for engine SpawnNextToOrDrop changes
SnappingOpossum Jun 1, 2026
62f17f2
Merge branch 'space-wizards:master' into ContentSpawnNextToOrDrop
SnappingOpossum Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityEntityEffectSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ protected override void Effect(Entity<TransformComponent> entity, ref EntityEffe
{
for (var i = 0; i < quantity; i++)
{
PredictedSpawnNextToOrDrop(proto, entity, entity.Comp);
PredictedSpawnNextToOrDrop(proto, entity!);
}
}
else if (_net.IsServer)
{
for (var i = 0; i < quantity; i++)
{
SpawnNextToOrDrop(proto, entity, entity.Comp);
SpawnNextToOrDrop(proto, entity!);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ private void OnSpikeButcherDoAfter(Entity<KitchenSpikeComponent> ent, ref SpikeB
var index = rand.Next(butcherable.SpawnedEntities.Count);
var entry = butcherable.SpawnedEntities[index];

var uid = PredictedSpawnNextToOrDrop(entry.PrototypeId, ent);
var uid = PredictedSpawnNextToOrDrop(entry.PrototypeId, ent.Owner);
_metaDataSystem.SetEntityName(uid,
Loc.GetString("comp-kitchen-spike-meat-name",
("name", Name(uid)),
Expand Down
8 changes: 2 additions & 6 deletions Content.Shared/Nutrition/EntitySystems/FoodSequenceSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ public sealed partial class FoodSequenceSystem : SharedFoodSequenceSystem
[Dependency] private IngestionSystem _ingestion = default!;
[Dependency] private SharedPopupSystem _popup = default!;
[Dependency] private SharedSolutionContainerSystem _solutionContainer = default!;
[Dependency] private SharedTransformSystem _transform = default!;
[Dependency] private TagSystem _tag = default!;

public override void Initialize()
Expand Down Expand Up @@ -85,12 +84,9 @@ private bool TryMetamorph(Entity<FoodSequenceStartPointComponent> start)

private void Metamorf(Entity<FoodSequenceStartPointComponent> start, MetamorphRecipePrototype recipe)
{
var result = PredictedSpawnNextToOrDrop(recipe.Result, start);
var result = PredictedSpawnNextToOrDrop(recipe.Result, start.Owner);

//Try putting in container
_transform.DropNextTo(result, (start, Transform(start)));

if (!_solutionContainer.TryGetSolution(result, start.Comp.Solution, out var resultSoln, out var resultSolution))
if (!_solutionContainer.TryGetSolution(result, start.Comp.Solution, out var resultSoln))
return;

if (!_solutionContainer.TryGetSolution(start.Owner, start.Comp.Solution, out var startSoln, out var startSolution))
Expand Down
Loading