From 672709382dd0e24bcd8ede651d54789707bb0b30 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Mon, 16 Feb 2015 20:21:55 -0500 Subject: [PATCH] Fixes runtime --- code/modules/projectiles/projectile.dm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 6176a485696..88576269cff 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -204,11 +204,13 @@ //the bullet passes through a dense object! if(passthrough) bumped = 0 //reset bumped variable! - if(istype(A, /turf)) - loc = A - else - loc = A.loc - permutated.Add(A) + //move ourselves onto A so we don't Bump it again. If A was deleted then we don't need to worry. + if(A) + if(istype(A, /turf)) + loc = A + else + loc = A.loc + permutated.Add(A) return 0 //stop flying