From 26f7902c3f5f9f6c007a2ce6731e31a877e31291 Mon Sep 17 00:00:00 2001
From: Rachael Alexanderson <eruanna@drdteam.org>
Date: Thu, 2 Mar 2017 06:27:18 -0500
Subject: [PATCH] - fixed: If player is killed by world, attacker was not
 checked for nullptr, causing a crash.

---
 src/p_interaction.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp
index b4cb5d16f..9629ccfe8 100644
--- a/src/p_interaction.cpp
+++ b/src/p_interaction.cpp
@@ -253,6 +253,7 @@ void ClientObituary (AActor *self, AActor *inflictor, AActor *attacker, int dmgf
 		}
 	}
 	if (message == nullptr) message = messagename;	// fallback to defaults if possible.
+	if (attacker == nullptr) attacker = self; // world
 	if (attacker->player == nullptr) attacker = self;	// for the message creation
 
 	if (message != NULL && message[0] == '$')