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

Merge branch 'master' into EntityCustomName

Browse Source 
Conflicts:
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/World.cpp
	src/World.h
This commit is contained in:
Howaner
2014-09-23 14:39:49 +02:00
parent 42dcd534df de163f0134
commit 4b38e077cf
232 changed files with 10895 additions and 4787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mobs/Monster.cpp
View File

@@ -91,6 +91,7 @@ cMonster::cMonster(const AString & a_ConfigName, eType a_MobType, const AString
, m_DropChanceBoots(0.085f)
, m_CanPickUpLoot(true)
, m_BurnsInDaylight(false)
, m_RelativeWalkSpeed(1.0)
{
if (!a_ConfigName.empty())
{
@@ -284,7 +285,7 @@ void cMonster::Tick(float a_Dt, cChunk & a_Chunk)
}
}
Vector3f Distance = m_Destination - GetPosition();
Vector3d Distance = m_Destination - GetPosition();
if (!ReachedDestination() && !ReachedFinalDestination()) // If we haven't reached any sort of destination, move
{
Distance.y = 0;
@@ -304,6 +305,9 @@ void cMonster::Tick(float a_Dt, cChunk & a_Chunk)
Distance *= 0.25f;
}
// Apply walk speed:
Distance *= m_RelativeWalkSpeed;
AddSpeedX(Distance.x);
AddSpeedZ(Distance.z);