tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update content for .Owner culling (#14185)

Browse Source
This commit is contained in:
metalgearsloth
2023-02-22 12:45:32 +11:00
committed by GitHub
parent c1d31e1666
commit 2e25128770
9 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Materials/MaterialStorageSystem.cs
View File

@@ -44,7 +44,7 @@ public sealed class MaterialStorageSystem : SharedMaterialStorageSystem
{ {
if (!base.TryInsertMaterialEntity(user, toInsert, receiver, component)) if (!base.TryInsertMaterialEntity(user, toInsert, receiver, component))
return false; return false;
_transform.DetachParentToNull(Transform(toInsert)); _transform.DetachParentToNull(toInsert, Transform(toInsert));
return true; return true;
} }
} }

2
Content.Client/Stack/StackSystem.cs
View File

@@ -28,7 +28,7 @@ namespace Content.Client.Stack
// TODO PREDICT ENTITY DELETION: This should really just be a normal entity deletion call. // TODO PREDICT ENTITY DELETION: This should really just be a normal entity deletion call.
if (component.Count <= 0) if (component.Count <= 0)
{ {
Xform.DetachParentToNull(Transform(uid)); Xform.DetachParentToNull(uid, Transform(uid));
return; return;
} }

2
Content.Server/Parallax/BiomeSystem.cs
View File

@@ -206,7 +206,7 @@ public sealed class BiomeSystem : SharedBiomeSystem
// At least for now unless we do lookups or smth, only work with anchoring. // At least for now unless we do lookups or smth, only work with anchoring.
if (xformQuery.TryGetComponent(ent, out var xform) && !xform.Anchored) if (xformQuery.TryGetComponent(ent, out var xform) && !xform.Anchored)
{ {
_transform.AnchorEntity(xform, grid, indices); _transform.AnchorEntity(ent, xform, grid, indices);
} }
loadedEntities.Add(ent); loadedEntities.Add(ent);

2
Content.Server/Station/Systems/StationSystem.cs
View File

@@ -349,7 +349,7 @@ public sealed class StationSystem : EntitySystem
// TODO SERIALIZATION The station data needs to be saveable somehow, but when a map gets saved, this entity // TODO SERIALIZATION The station data needs to be saveable somehow, but when a map gets saved, this entity
// won't be included because its in null-space. Also, what happens to shuttles on other maps? // won't be included because its in null-space. Also, what happens to shuttles on other maps?
_transform.DetachParentToNull(Transform(station)); _transform.DetachParentToNull(station, Transform(station));
var data = AddComp<StationDataComponent>(station); var data = AddComp<StationDataComponent>(station);
var metaData = MetaData(station); var metaData = MetaData(station);

2
Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/RandomTeleportArtifactSystem.cs
View File

@@ -23,6 +23,6 @@ public sealed class RandomTeleportArtifactSystem : EntitySystem
var xform = Transform(uid); var xform = Transform(uid);
_popup.PopupCoordinates(Loc.GetString("blink-artifact-popup"), xform.Coordinates, PopupType.Medium); _popup.PopupCoordinates(Loc.GetString("blink-artifact-popup"), xform.Coordinates, PopupType.Medium);
_xform.SetCoordinates(xform, xform.Coordinates.Offset(_random.NextVector2(component.Range))); _xform.SetCoordinates(uid, xform, xform.Coordinates.Offset(_random.NextVector2(component.Range)));
} }
} }

3
Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ShuffleArtifactSystem.cs
View File

@@ -38,7 +38,8 @@ public sealed class ShuffleArtifactSystem : EntitySystem
foreach (var xform in toShuffle) foreach (var xform in toShuffle)
{ {
_xform.SetCoordinates(xform, _random.PickAndTake(allCoords)); var xformUid = xform.Owner;
_xform.SetCoordinates(xformUid, xform, _random.PickAndTake(allCoords));
} }
} }
} }

4
Content.Shared/Blocking/BlockingSystem.cs
View File

@@ -173,7 +173,7 @@ public sealed partial class BlockingSystem : EntitySystem
} }
//Don't allow someone to block if they're somehow not anchored. //Don't allow someone to block if they're somehow not anchored.
_transformSystem.AnchorEntity(xform); _transformSystem.AnchorEntity(user, xform);
if (!xform.Anchored) if (!xform.Anchored)
{ {
CantBlockError(user); CantBlockError(user);
@@ -238,7 +238,7 @@ public sealed partial class BlockingSystem : EntitySystem
&& TryComp<PhysicsComponent>(user, out var physicsComponent)) && TryComp<PhysicsComponent>(user, out var physicsComponent))
{ {
if (xform.Anchored) if (xform.Anchored)
_transformSystem.Unanchor(xform); _transformSystem.Unanchor(user, xform);
_actionsSystem.SetToggled(component.BlockingToggleAction, false); _actionsSystem.SetToggled(component.BlockingToggleAction, false);
_fixtureSystem.DestroyFixture(user, BlockingComponent.BlockFixtureID, body: physicsComponent); _fixtureSystem.DestroyFixture(user, BlockingComponent.BlockFixtureID, body: physicsComponent);

2
Content.Shared/Follower/FollowerSystem.cs
View File

@@ -73,7 +73,7 @@ public sealed class FollowerSystem : EntitySystem
followedComp.Following.Add(follower); followedComp.Following.Add(follower);
var xform = Transform(follower); var xform = Transform(follower);
_transform.SetParent(xform, entity); _transform.SetParent(follower, xform, entity);
xform.LocalPosition = Vector2.Zero; xform.LocalPosition = Vector2.Zero;
xform.LocalRotation = Angle.Zero; xform.LocalRotation = Angle.Zero;

2
Content.Shared/Tabletop/SharedTabletopSystem.cs
View File

@@ -40,7 +40,7 @@ namespace Content.Shared.Tabletop
// Move the entity and dirty it (we use the map ID from the entity so noone can try to be funny and move the item to another map) // Move the entity and dirty it (we use the map ID from the entity so noone can try to be funny and move the item to another map)
var transform = EntityManager.GetComponent<TransformComponent>(msg.MovedEntityUid); var transform = EntityManager.GetComponent<TransformComponent>(msg.MovedEntityUid);
_transforms.SetParent(transform, _mapMan.GetMapEntityId(transform.MapID)); _transforms.SetParent(msg.MovedEntityUid, transform, _mapMan.GetMapEntityId(transform.MapID));
_transforms.SetLocalPositionNoLerp(transform, msg.Coordinates.Position); _transforms.SetLocalPositionNoLerp(transform, msg.Coordinates.Position);
} }