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

Stop Wolf from following player when he is flying

Browse Source 
Check to make sure player is not flying before allowing wolf to move to player.

Fixed isFlying to IsFlying
This commit is contained in:
Tyler Encke 2016-02-18 16:07:17 -05:00 committed by Enky
parent dc4ea39755
commit f29908ce77
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mobs/Wolf.cpp
View File

@ -344,10 +344,12 @@ void cWolf::TickFollowPlayer()
virtual bool Item(cPlayer * a_Player) override virtual bool Item(cPlayer * a_Player) override
{ {
OwnerPos = a_Player->GetPosition(); OwnerPos = a_Player->GetPosition();
OwnerFlying = a_Player->IsFlying();
return true; return true;
} }
public: public:
Vector3d OwnerPos; Vector3d OwnerPos;
bool OwnerFlying;
} Callback; } Callback;
if (m_World->DoWithPlayerByUUID(m_OwnerUUID, Callback)) if (m_World->DoWithPlayerByUUID(m_OwnerUUID, Callback))
@ -355,11 +357,14 @@ void cWolf::TickFollowPlayer()
// The player is present in the world, follow him: // The player is present in the world, follow him:
double Distance = (Callback.OwnerPos - GetPosition()).Length(); double Distance = (Callback.OwnerPos - GetPosition()).Length();
if (Distance > 20) if (Distance > 20)
{
if (!Callback.OwnerFlying)
{ {
Callback.OwnerPos.y = FindFirstNonAirBlockPosition(Callback.OwnerPos.x, Callback.OwnerPos.z); Callback.OwnerPos.y = FindFirstNonAirBlockPosition(Callback.OwnerPos.x, Callback.OwnerPos.z);
TeleportToCoords(Callback.OwnerPos.x, Callback.OwnerPos.y, Callback.OwnerPos.z); TeleportToCoords(Callback.OwnerPos.x, Callback.OwnerPos.y, Callback.OwnerPos.z);
SetTarget(nullptr); SetTarget(nullptr);
} }
}
if (Distance < 2) if (Distance < 2)
{ {
if (GetTarget() == nullptr) if (GetTarget() == nullptr)
@ -370,12 +375,15 @@ void cWolf::TickFollowPlayer()
else else
{ {
if (GetTarget() == nullptr) if (GetTarget() == nullptr)
{
if (!Callback.OwnerFlying)
{ {
MoveToPosition(Callback.OwnerPos); MoveToPosition(Callback.OwnerPos);
} }
} }
} }
} }
}