Skip to content
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

Update BiomeSystem.cs to not use Component.Owner #29939

Merged
merged 1 commit into from
Jul 12, 2024
Merged

Update BiomeSystem.cs to not use Component.Owner #29939

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 5 additions & 7 deletions Content.Server/Parallax/BiomeSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,20 +126,18 @@ private void OnBiomeMapInit(EntityUid uid, BiomeComponent component, MapInitEven
var xform = Transform(uid);
var mapId = xform.MapID;

if (mapId != MapId.Nullspace && TryComp(uid, out MapGridComponent? mapGrid))
if (mapId != MapId.Nullspace && HasComp<MapGridComponent>(uid))
{
var setTiles = new List<(Vector2i Index, Tile tile)>();

foreach (var grid in _mapManager.GetAllMapGrids(mapId))
foreach (var grid in _mapManager.GetAllGrids(mapId))
{
var gridUid = grid.Owner;

if (!_fixturesQuery.TryGetComponent(gridUid, out var fixtures))
if (!_fixturesQuery.TryGetComponent(grid.Owner, out var fixtures))
continue;

// Don't want shuttles flying around now do we.
_shuttles.Disable(gridUid);
var pTransform = _physics.GetPhysicsTransform(gridUid);
_shuttles.Disable(grid.Owner);
var pTransform = _physics.GetPhysicsTransform(grid.Owner);

foreach (var fixture in fixtures.Fixtures.Values)
{
Expand Down
Loading