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

Merge branch 'master' into PreventNewWarnings

Browse Source 
Conflicts:
	src/Entities/ArrowEntity.cpp
This commit is contained in:
tycho
2015-05-29 00:12:56 +01:00
parent b2fa71a32a 15d49d0cb9
commit 4956e8700d
9 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Mobs/Monster.cpp
View File

@@ -517,8 +517,15 @@ void cMonster::SetPitchAndYawFromDestination()
}
Vector3d BodyDistance = m_NextWayPointPosition - GetPosition();
Vector3d BodyDistance;
if (!m_IsFollowingPath && (m_Target != nullptr))
{
BodyDistance = m_Target->GetPosition() - GetPosition();
}
else
{
BodyDistance = m_NextWayPointPosition - GetPosition();
}
double BodyRotation, BodyPitch;
BodyDistance.Normalize();
VectorToEuler(BodyDistance.x, BodyDistance.y, BodyDistance.z, BodyRotation, BodyPitch);