From 39d99485eb420b3fa5b04b300ffacec9f561d01a Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Thu, 9 Jan 2020 00:15:48 +0100 Subject: [PATCH] Fix laser weapons always hitting yourself. --- .../Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs index 84d4f13abb..dfdd46f4b4 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs @@ -90,8 +90,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan var angle = new Angle(clickLocation.Position - userPosition); var ray = new Ray(userPosition, angle.ToVec(), (int)(CollisionGroup.Impassable | CollisionGroup.MobImpassable)); - var rayCastResults = IoCManager.Resolve().IntersectRay(ray, MaxLength, - Owner.Transform.GetMapTransform().Owner); + var rayCastResults = IoCManager.Resolve().IntersectRay(ray, MaxLength, user); Hit(rayCastResults, energyModifier); AfterEffects(user, rayCastResults, angle, energyModifier);