Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

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.
_transformSystem.AnchorEntity(xform);
_transformSystem.AnchorEntity(user, xform);
if (!xform.Anchored)
{
CantBlockError(user);
@@ -238,7 +238,7 @@ public sealed partial class BlockingSystem : EntitySystem
&& TryComp<PhysicsComponent>(user, out var physicsComponent))
{
if (xform.Anchored)
_transformSystem.Unanchor(xform);
_transformSystem.Unanchor(user, xform);
_actionsSystem.SetToggled(component.BlockingToggleAction, false);
_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);
var xform = Transform(follower);
_transform.SetParent(xform, entity);
_transform.SetParent(follower, xform, entity);
xform.LocalPosition = Vector2.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)
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);
}