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

Moved reading flags to the protocol.

This commit is contained in:
STRWarrior 2013-12-15 15:11:59 +01:00
parent 9fe06af598
commit ffb5a69a9e
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ClientHandle.cpp
View File

@ -490,24 +490,10 @@ void cClientHandle::HandleCreativeInventory(short a_SlotNum, const cItem & a_Hel
void cClientHandle::HandlePlayerAbilities(int Flags, float FlyingSpeed, float WalkingSpeed)
void cClientHandle::HandlePlayerAbilities(bool a_CanFly, bool a_IsFlying, float FlyingSpeed, float WalkingSpeed)
{
if ((Flags & 2) != 0)
{
m_Player->SetFlying(true);
}
else
{
m_Player->SetFlying(false);
}
if ((Flags & 4) != 0)
{
m_Player->SetCanFly(true);
}
else
{
m_Player->SetCanFly(false);
}
m_Player->SetCanFly(a_CanFly);
m_Player->SetFlying(a_IsFlying);
}

2
src/ClientHandle.h
View File

@ -176,7 +176,7 @@ public:
void HandleKeepAlive (int a_KeepAliveID);
void HandleLeftClick (int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, char a_Status);
void HandlePing (void);
void HandlePlayerAbilities (int Flags, float FlyingSpeed, float WalkingSpeed);
void HandlePlayerAbilities (bool a_CanFly, bool a_IsFlying, float FlyingSpeed, float WalkingSpeed);
void HandlePlayerLook (float a_Rotation, float a_Pitch, bool a_IsOnGround);
void HandlePlayerMoveLook (double a_PosX, double a_PosY, double a_PosZ, double a_Stance, float a_Rotation, float a_Pitch, bool a_IsOnGround); // While m_bPositionConfirmed (normal gameplay)
void HandlePlayerPos (double a_PosX, double a_PosY, double a_PosZ, double a_Stance, bool a_IsOnGround);

20
src/Protocol/Protocol17x.cpp
View File

@ -1286,7 +1286,25 @@ void cProtocol172::HandlePacketPlayerAbilities(cByteBuffer & a_ByteBuffer)
HANDLE_READ(a_ByteBuffer, ReadByte, Byte, Flags);
HANDLE_READ(a_ByteBuffer, ReadBEFloat, float, FlyingSpeed);
HANDLE_READ(a_ByteBuffer, ReadBEFloat, float, WalkingSpeed);
m_Client->HandlePlayerAbilities(Flags, FlyingSpeed, WalkingSpeed);
bool IsFlying, CanFly;
if ((Flags & 2) != 0)
{
IsFlying = true;
}
else
{
IsFlying = false;
}
if ((Flags & 4) != 0)
{
CanFly = true;
}
else
{
CanFly = false;
}
m_Client->HandlePlayerAbilities(CanFly, IsFlying, FlyingSpeed, WalkingSpeed);
}