From 883a6ffe3a80aa5d19d0bf8a96e4d13e23bca6ac Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Tue, 27 Feb 2018 10:40:43 +0100
Subject: [PATCH] - added an inventory check to A_KeenDie so that it still
 works if a patch repurposes a pickup item that may end up in the player's
 inventory.

---
 wadsrc/static/zscript/doom/keen.txt | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/wadsrc/static/zscript/doom/keen.txt b/wadsrc/static/zscript/doom/keen.txt
index 6d596c717a..083df92b48 100644
--- a/wadsrc/static/zscript/doom/keen.txt
+++ b/wadsrc/static/zscript/doom/keen.txt
@@ -70,8 +70,13 @@ extend class Actor
 		{
 			if (mo.health > 0 && mo != self)
 			{
-				// other Keen not dead
-				return;
+				// Added check for Dehacked and repurposed inventory items.
+				let inv = Inventory(mo);
+				if (inv == null || inv.Owner == null)
+				{
+					// other Keen not dead
+					return;
+				}
 			}
 		}
 		Door_Open(doortag, 16);