space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-14 19:29:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Physics (#1602)"

Browse Source 
This reverts commit fefcc7cba3.
This commit is contained in:
Pieter-Jan Briers
2021-02-28 18:45:18 +01:00
parent 2ace0e9e5a
commit d751c0b3ab
106 changed files with 3170 additions and 13103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Robust.Server/GameObjects/ServerEntityManager.cs
View File

@@ -9,7 +9,6 @@ using Robust.Shared.Configuration;
using Robust.Shared.GameObjects;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Physics;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
@@ -368,7 +367,7 @@ namespace Robust.Server.GameObjects
continue;
}
if (entity.TryGetComponent(out IPhysBody? body))
if (entity.TryGetComponent(out IPhysicsComponent? body))
{
if (body.LinearVelocity.EqualsApprox(Vector2.Zero, MinimumMotionForMovers))
{
@@ -535,7 +534,7 @@ namespace Robust.Server.GameObjects
continue;
}
if (!entity.TryGetComponent(out IPhysBody? body))
if (!entity.TryGetComponent(out IPhysicsComponent? body))
{
// can't be a mover w/o physics
continue;
@@ -789,7 +788,7 @@ namespace Robust.Server.GameObjects
{
addToMovers = true;
}
else if (entity.TryGetComponent(out IPhysBody? physics)
else if (entity.TryGetComponent(out IPhysicsComponent? physics)
&& physics.LastModifiedTick >= currentTick)
{
addToMovers = true;