flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #3440 from cuberite/FixWolfTarget 

cWolf: Fixed targetting a nullptr.
This commit is contained in:
Lukas Pioch 2016-11-22 18:01:57 +01:00 committed by GitHub
parent 59463be832 d17b21da55
commit 852dbe9ab4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mobs/Wolf.cpp
View File

@ -38,11 +38,12 @@ bool cWolf::DoTakeDamage(TakeDamageInfo & a_TDI)
if ((a_TDI.Attacker != nullptr) && a_TDI.Attacker->IsPawn())
{
if (GetTarget()->IsPlayer())
auto currTarget = GetTarget();
if ((currTarget != nullptr) && currTarget->IsPlayer())
{
if (m_IsTame)
{
if ((static_cast<cPlayer*>(GetTarget())->GetUUID() == m_OwnerUUID))
if ((static_cast<cPlayer*>(currTarget)->GetUUID() == m_OwnerUUID))
{
SetTarget(PreviousTarget); // Do not attack owner
}
@ -64,7 +65,6 @@ bool cWolf::DoTakeDamage(TakeDamageInfo & a_TDI)
}
}
m_World->BroadcastEntityMetadata(*this); // Broadcast health and possibly angry face
return true;
}