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

Added IsSwimming and IsSubmerged flags and access methods

Browse Source
This commit is contained in:
James Ravenscroft
2013-08-09 08:37:39 +01:00
parent 2b9fdc3e36
commit dace1f7bd2
3 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/ClientHandle.cpp
View File

@@ -32,7 +32,6 @@
#include "Protocol/ProtocolRecognizer.h"
#define float2int(x) ((x)<0 ? ((int)(x))-1 : (int)(x))
#define AddPistonDir(x, y, z, dir, amount) switch (dir) { case 0: (y)-=(amount); break; case 1: (y)+=(amount); break;\
@@ -505,9 +504,8 @@ void cClientHandle::HandlePlayerPos(double a_PosX, double a_PosY, double a_PosZ,
if ((a_PosY > m_Player->GetPosY()) && !a_IsOnGround && m_Player->IsOnGround())
{
// we only add this exhaustion if the player is not swimming - otherwise we end up with both jump + swim exhaustion
cWorld * World = m_Player->GetWorld();
BLOCKTYPE BlockType = World->GetBlock( float2int(m_Player->GetPosX()), float2int(m_Player->GetPosY()), float2int(m_Player->GetPosZ()) );
if(! IsBlockWater(BlockType) )
if(! m_Player->IsSwimming() )
{
m_Player->AddFoodExhaustion(m_Player->IsSprinting() ? 0.8 : 0.2);
}