Public API changes to IPhysBody and MoverController.

This commit is contained in:
Acruid
2020-07-21 23:42:33 -07:00
parent 551973fbb9
commit f34b454923
4 changed files with 5 additions and 5 deletions

View File

@@ -268,7 +268,7 @@ namespace Content.Shared.GameObjects.Components.Movement
bool ICollideSpecial.PreventCollide(IPhysBody collidedWith) bool ICollideSpecial.PreventCollide(IPhysBody collidedWith)
{ {
// Don't collide with other mobs // Don't collide with other mobs
return collidedWith.Owner.HasComponent<SharedSpeciesComponent>(); return collidedWith.Entity.HasComponent<SharedSpeciesComponent>();
} }
[Serializable, NetSerializable] [Serializable, NetSerializable]

View File

@@ -39,7 +39,7 @@ namespace Content.Shared.GameObjects.Components.Projectiles
public bool PreventCollide(IPhysBody collidedwith) public bool PreventCollide(IPhysBody collidedwith)
{ {
return IgnoreShooter && collidedwith.Owner.Uid == Shooter; return IgnoreShooter && collidedwith.Entity.Uid == Shooter;
} }
} }
} }

View File

@@ -10,7 +10,7 @@ namespace Content.Shared.Physics
public class MoverController : VirtualController public class MoverController : VirtualController
{ {
private Vector2 _velocity; private Vector2 _velocity;
private IPhysicsComponent _component = null; private ICollidableComponent _component = null;
public Vector2 Velocity public Vector2 Velocity
{ {
@@ -18,7 +18,7 @@ namespace Content.Shared.Physics
set => _velocity = value; set => _velocity = value;
} }
public override IPhysicsComponent ControlledComponent public override ICollidableComponent? ControlledComponent
{ {
set => _component = value; set => _component = value;
} }