tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reset velocity after warp (#1680)

Browse Source 
* Reset velocity after warp

* Rather than looping through the controllers manually, just call collidable.stop
This commit is contained in:
Exp
2020-08-15 20:35:02 +02:00
committed by GitHub
parent bb781f4975
commit f37d6343ce
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Administration/WarpCommand.cs
View File

@@ -4,10 +4,12 @@ using Content.Server.GameObjects.Components.Markers;
using Robust.Server.Interfaces.Console; using Robust.Server.Interfaces.Console;
using Robust.Server.Interfaces.Player; using Robust.Server.Interfaces.Player;
using Robust.Shared.Enums; using Robust.Shared.Enums;
using Robust.Shared.GameObjects.Components;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Map;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Maths;
namespace Content.Server.Administration namespace Content.Server.Administration
{ {
@@ -107,6 +109,10 @@ namespace Content.Server.Administration
if (found.GridID != GridId.Invalid) if (found.GridID != GridId.Invalid)
{ {
player.AttachedEntity.Transform.GridPosition = found; player.AttachedEntity.Transform.GridPosition = found;
if (player.AttachedEntity.TryGetComponent(out ICollidableComponent collidable))
{
collidable.Stop();
}
} }
else else
{ {