From f045f0c4415bfcaeeae17b846d5fd4a1d45fbbf9 Mon Sep 17 00:00:00 2001 From: AJCM-git <60196617+AJCM-git@users.noreply.github.com> Date: Sat, 9 Jul 2022 05:49:30 -0400 Subject: [PATCH] Making smites funnier (#9524) --- Content.Server/Magic/MagicSystem.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Content.Server/Magic/MagicSystem.cs b/Content.Server/Magic/MagicSystem.cs index f482272829..ddb0afc1d5 100644 --- a/Content.Server/Magic/MagicSystem.cs +++ b/Content.Server/Magic/MagicSystem.cs @@ -174,7 +174,7 @@ public sealed class MagicSystem : EntitySystem // This is shit but you get the idea. var directionPos = casterXform.Coordinates.Offset(casterXform.LocalRotation.ToWorldVec().Normalized); - if (!_mapManager.TryGetGrid(casterXform.GridID, out var mapGrid)) + if (!_mapManager.TryGetGrid(casterXform.GridUid, out var mapGrid)) return new List(); if (!directionPos.TryGetTileRef(out var tileReference, EntityManager, _mapManager)) @@ -273,6 +273,10 @@ public sealed class MagicSystem : EntitySystem if (ev.Handled) return; + var direction = Transform(ev.Target).MapPosition.Position - Transform(ev.Performer).MapPosition.Position; + var impulseVector = direction * 10000; + Comp(ev.Target).ApplyLinearImpulse(impulseVector); + if (!TryComp(ev.Target, out var body)) return;