summaryrefslogtreecommitdiffstats
path: root/src/Mobs/Wolf.cpp
diff options
context:
space:
mode:
authorLogicParrot <LogicParrot@users.noreply.github.com>2016-01-16 15:58:49 +0100
committerLogicParrot <LogicParrot@users.noreply.github.com>2016-01-16 15:58:49 +0100
commitdc33276dda5beacf9470d6060f72730118ba550d (patch)
tree6ebcb9d63146b2626311220b69b0c311e2a74c94 /src/Mobs/Wolf.cpp
parentMerge pull request #2875 from LogicParrot/fallDamage (diff)
parentFix crash when tamed wolf is hit by arrows (diff)
downloadcuberite-dc33276dda5beacf9470d6060f72730118ba550d.tar
cuberite-dc33276dda5beacf9470d6060f72730118ba550d.tar.gz
cuberite-dc33276dda5beacf9470d6060f72730118ba550d.tar.bz2
cuberite-dc33276dda5beacf9470d6060f72730118ba550d.tar.lz
cuberite-dc33276dda5beacf9470d6060f72730118ba550d.tar.xz
cuberite-dc33276dda5beacf9470d6060f72730118ba550d.tar.zst
cuberite-dc33276dda5beacf9470d6060f72730118ba550d.zip
Diffstat (limited to 'src/Mobs/Wolf.cpp')
-rw-r--r--src/Mobs/Wolf.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Mobs/Wolf.cpp b/src/Mobs/Wolf.cpp
index e074cfe2e..174fee9b1 100644
--- a/src/Mobs/Wolf.cpp
+++ b/src/Mobs/Wolf.cpp
@@ -73,8 +73,12 @@ bool cWolf::Attack(std::chrono::milliseconds a_Dt)
-void cWolf::NearbyPlayerIsFighting(cPlayer * a_Player, cEntity * a_Opponent)
+void cWolf::NearbyPlayerIsFighting(cPlayer * a_Player, cPawn * a_Opponent)
{
+ if (a_Opponent == nullptr)
+ {
+ return;
+ }
if ((m_Target == nullptr) && (a_Player->GetName() == m_OwnerName) && !IsSitting() && (a_Opponent->IsPawn()))
{
m_Target = a_Opponent;