From d22aee94a1997231a797c5d0ccce13411deddae2 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Mon, 11 Dec 2017 09:30:13 -0800 Subject: [PATCH] Fixes nulls (#33440) --- code/modules/projectiles/projectile.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 9ae82d441d..0e3bd98c68 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -359,8 +359,9 @@ forceMove(get_turf(source)) starting = get_turf(source) original = target - yo = targloc.y - curloc.y - xo = targloc.x - curloc.x + if(targloc || !params) + yo = targloc.y - curloc.y + xo = targloc.x - curloc.x if(isliving(source) && params) var/list/calculated = calculate_projectile_angle_and_pixel_offsets(source, params)