From 7cb8dfd1f8a44be08e349655bdaf9dcd31e51750 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Wed, 21 May 2014 21:32:57 +0100
Subject: [PATCH] [Change] Don't abort autonav if damage is from volatile
 system.

---
 src/pilot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pilot.c b/src/pilot.c
index 0b0bffe..678d324 100644
--- a/src/pilot.c
+++ b/src/pilot.c
@@ -455,7 +455,7 @@ void pilot_hit(Pilot* p, const Solid* w, const unsigned int shooter,
   /* Calculate the damage. */
   outfit_calcDamage(&damage_shield, &damage_armour, &knockback,  dtype, damage);
 
-  if((p->id == PLAYER_ID) &&
+  if((w != NULL) && (p->id == PLAYER_ID) &&
       !pilot_isFlag(player, PILOT_HYP_BEGIN) &&
       !pilot_isFlag(player, PILOT_HYPERSPACE))
   	player_abortAutonav("Sustaining Damage");