From 1bc5329185b8f34a1816ef84fd18e78ddc0e2db3 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Sun, 17 Jul 2016 20:11:00 +0000
Subject: [PATCH] Fix null pointer deference

---
 dlls/prop.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/prop.cpp b/dlls/prop.cpp
index 62e02cf3..b850f9f6 100644
--- a/dlls/prop.cpp
+++ b/dlls/prop.cpp
@@ -1129,7 +1129,7 @@ int CProp::TakeDamage(entvars_t* pevInflictor, entvars_t* pevAttacker, float flD
 {
 	Vector r = (pevInflictor->origin - pev->origin);
 	if ( (!m_attacker
-		  || (pev->velocity.Length() < 700))
+		  || (pev->velocity.Length() < 700)) && ((CBaseEntity*)GET_PRIVATE(ENT(pevAttacker)))
 		 && ((CBaseEntity*)GET_PRIVATE(ENT(pevAttacker)))->IsPlayer())
 		m_attacker.Set(ENT(pevAttacker));
 	DeployThink();