Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Physics (#3452)"

Browse Source 
This reverts commit 3e64fd56a1.
This commit is contained in:
Pieter-Jan Briers
2021-02-28 18:49:48 +01:00
parent eddec5fcce
commit 1eb0fbd8d0
211 changed files with 2560 additions and 2600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/GameObjects/Components/Portal/PortalComponent.cs
View File

@@ -5,7 +5,6 @@ using Content.Shared.GameObjects.Components.Portal;
using Content.Shared.GameObjects.Components.Tag;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.Physics;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
@@ -169,11 +168,11 @@ namespace Content.Server.GameObjects.Components.Portal
StartCooldown();
}
public void CollideWith(IPhysBody ourBody, IPhysBody otherBody)
public void CollideWith(IEntity collidedWith)
{
if (_onCooldown == false)
{
TryPortalEntity(otherBody.Entity);
TryPortalEntity(collidedWith);
}
}
}

5
Content.Server/GameObjects/Components/Portal/TeleporterComponent.cs
View File

@@ -9,7 +9,6 @@ using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Physics;
using Robust.Shared.Random;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
@@ -105,7 +104,7 @@ namespace Content.Server.GameObjects.Components.Portal
{
// Added this component to avoid stacking portals and causing shenanigans
// TODO: Doesn't do a great job of stopping stacking portals for directed
if (entity.HasComponent<IPhysBody>() || entity.HasComponent<TeleporterComponent>())
if (entity.HasComponent<IPhysicsComponent>() || entity.HasComponent<TeleporterComponent>())
{
return;
}
@@ -149,7 +148,7 @@ namespace Content.Server.GameObjects.Components.Portal
// TODO: Check the user's spot? Upside is no stacking TPs but downside is they can't unstuck themselves from walls.
foreach (var entity in _serverEntityManager.GetEntitiesIntersecting(user.Transform.MapID, target))
{
if (entity.HasComponent<IPhysBody>() || entity.HasComponent<PortalComponent>())
if (entity.HasComponent<IPhysicsComponent>() || entity.HasComponent<PortalComponent>())
{
return false;
}