Merge pull request #4327 from Citadel-Station-13/upstream-merge-33440

[MIRROR] Fixes projectile runtime due to click params but no target location (this happens when click catcher catches shoot clicks instead of normal firing.)
2017-12-11 18:20:38 +00:00
parent 36b0f7ecaf 77d2a95307
commit ba9fc0ccc5
1 changed files with 3 additions and 2 deletions
@@ -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)