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

Merge branch 'master' into 1.8-Protocol

Browse Source 
Conflicts:
	src/Items/ItemHoe.h
This commit is contained in:
Howaner
2014-09-13 01:21:43 +02:00
parent fb68382d9b 4019847857
commit 69afc4dbba
24 changed files with 186 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Entities/Entity.cpp
View File

@@ -941,19 +941,21 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
}
NextSpeed.y += fallspeed;
}
// Friction
if (NextSpeed.SqrLength() > 0.0004f)
else
{
NextSpeed.x *= 0.7f / (1 + a_Dt);
if (fabs(NextSpeed.x) < 0.05)
// Friction on ground
if (NextSpeed.SqrLength() > 0.0004f)
{
NextSpeed.x = 0;
}
NextSpeed.z *= 0.7f / (1 + a_Dt);
if (fabs(NextSpeed.z) < 0.05)
{
NextSpeed.z = 0;
NextSpeed.x *= 0.7f / (1 + a_Dt);
if (fabs(NextSpeed.x) < 0.05)
{
NextSpeed.x = 0;
}
NextSpeed.z *= 0.7f / (1 + a_Dt);
if (fabs(NextSpeed.z) < 0.05)
{
NextSpeed.z = 0;
}
}
}