From 0601adba25ad9d8f77450b75743255378b4a7b99 Mon Sep 17 00:00:00 2001
From: LogicParrot <LogicParrot@users.noreply.github.com>
Date: Sat, 16 Jan 2016 11:29:11 +0200
Subject: Fix fall damage crash when tamed wolves neabry

---
 src/Entities/Player.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index c5a1e0f95..270b09c24 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -852,7 +852,10 @@ bool cPlayer::DoTakeDamage(TakeDamageInfo & a_TDI)
 		AddFoodExhaustion(0.3f);
 		SendHealth();
 
-		NotifyFriendlyWolves(a_TDI.Attacker);
+		if (a_TDI.Attacker != nullptr)
+		{
+			NotifyFriendlyWolves(a_TDI.Attacker);
+		}
 		m_Stats.AddValue(statDamageTaken, FloorC<StatValue>(a_TDI.FinalDamage * 10 + 0.5));
 		return true;
 	}
@@ -865,6 +868,7 @@ bool cPlayer::DoTakeDamage(TakeDamageInfo & a_TDI)
 
 void cPlayer::NotifyFriendlyWolves(cEntity * a_Opponent)
 {
+	ASSERT(a_Opponent != nullptr);
 	class LookForWolves : public cEntityCallback
 	{
 	public:
-- 
cgit v1.2.3