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

Fix compile.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-07-02 14:00:45 +02:00
parent fbe5dbedaa
commit 7e061b5968
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs
View File

@@ -1,16 +1,12 @@
using System; using System;
using System.Collections.Generic;
using Content.Server.GameObjects.Components.Access; using Content.Server.GameObjects.Components.Access;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces.GameObjects.Components.Movement;
using Content.Server.Utility;
using Content.Shared.GameObjects.Components.Doors; using Content.Shared.GameObjects.Components.Doors;
using Content.Shared.GameObjects.Components.Movement;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components; using Robust.Shared.GameObjects.Components;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.Timers; using Robust.Shared.Timers;
@@ -102,7 +98,10 @@ namespace Content.Server.GameObjects
// TODO: temporary hack to fix the physics system raising collision events akwardly. // TODO: temporary hack to fix the physics system raising collision events akwardly.
// E.g. when moving parallel to a door by going off the side of a wall. // E.g. when moving parallel to a door by going off the side of a wall.
var dotProduct = Vector2.Dot(mover.VelocityDir.Normalized, (entity.Transform.WorldPosition - Owner.Transform.WorldPosition).Normalized); var (walking, sprinting) = mover.VelocityDir;
// Also TODO: walking and sprint dir are added together here
// instead of calculating their contribution correctly.
var dotProduct = Vector2.Dot((sprinting + walking).Normalized, (entity.Transform.WorldPosition - Owner.Transform.WorldPosition).Normalized);
if (dotProduct <= -0.9f) if (dotProduct <= -0.9f)
TryOpen(entity); TryOpen(entity);
} }

1
Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs
View File

@@ -6,6 +6,7 @@ using Robust.Shared.ViewVariables;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using Robust.Shared.GameObjects.Components;
namespace Content.Server.GameObjects.Components.NodeContainer.Nodes namespace Content.Server.GameObjects.Components.NodeContainer.Nodes
{ {

1
Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverComponent.cs
View File

@@ -8,6 +8,7 @@ using Robust.Shared.IoC;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using System; using System;
using Robust.Shared.GameObjects.Components;
namespace Content.Server.GameObjects.Components.Power.ApcNetComponents namespace Content.Server.GameObjects.Components.Power.ApcNetComponents
{ {