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

Merge pull request #2356 from LO1ZB/ImproveHunger

Browse Source 
Fix food drain on movement.
This commit is contained in:
Julian Laubstein 2015-07-14 23:16:36 +02:00
commit d7b10607d4
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Entities/Player.cpp
View File

@ -16,6 +16,7 @@
#include "../Items/ItemHandler.h" #include "../Items/ItemHandler.h"
#include "../Vector3.h" #include "../Vector3.h"
#include "../FastRandom.h" #include "../FastRandom.h"
#include <cmath>
#include "../WorldStorage/StatSerializer.h" #include "../WorldStorage/StatSerializer.h"
#include "../CompositeChat.h" #include "../CompositeChat.h"
@ -2178,20 +2179,18 @@ void cPlayer::ApplyFoodExhaustionFromMovement()
return; return;
} }
// Process exhaustion every two ticks as that is how frequently m_LastPos is updated
// Otherwise, we apply exhaustion for a 'movement' every tick, one of which is an already processed value
if (GetWorld()->GetWorldAge() % 2 != 0)
{
return;
}
// Calculate the distance travelled, update the last pos: // Calculate the distance travelled, update the last pos:
Vector3d Movement(GetPosition() - m_LastPos); double SpeedX = m_Speed.x;
Movement.y = 0; // Only take XZ movement into account double SpeedZ = m_Speed.z;
double BaseExhaustion(sqrt((SpeedX * SpeedX) + (SpeedZ * SpeedZ)));
// Apply the exhaustion based on distance travelled: // Apply the exhaustion based on distance travelled:
double BaseExhaustion = Movement.Length(); if (IsFlying() || IsClimbing())
if (IsSprinting()) {
// Apply no exhaustion when flying or climbing.
BaseExhaustion = 0;
}
else if (IsSprinting())
{ {
// 0.1 pt per meter sprinted // 0.1 pt per meter sprinted
BaseExhaustion = BaseExhaustion * 0.1; BaseExhaustion = BaseExhaustion * 0.1;