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

Unused/duplicate function cleanup 

* FaceIntToBlockFace in 1.8/1.9 protocol merged
- Removed undefined permissions stuff in Player header
This commit is contained in:
Tiger Wang 2020-08-29 16:47:40 +01:00
parent d2e92440eb
commit 07ffd9f6f3
5 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Entities/Player.h
View File

@ -767,9 +767,6 @@ protected:
/** Sets the speed and sends it to the client, so that they are forced to move so. */
virtual void DoSetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ) override;
void ResolvePermissions(void);
void ResolveGroups(void);
virtual void Destroyed(void) override;
/** Filters out damage for creative mode / friendly fire */

2
src/Protocol/Protocol_1_8.cpp
View File

@ -3172,7 +3172,7 @@ void cProtocol_1_8_0::StartEncryption(const Byte * a_Key)
eBlockFace cProtocol_1_8_0::FaceIntToBlockFace(Int8 a_BlockFace)
eBlockFace cProtocol_1_8_0::FaceIntToBlockFace(const Int32 a_BlockFace)
{
// Normalize the blockface values returned from the protocol
// Anything known gets mapped 1:1, everything else returns BLOCK_FACE_NONE

2
src/Protocol/Protocol_1_8.h
View File

@ -226,7 +226,7 @@ protected:
/** Converts the BlockFace received by the protocol into eBlockFace constants.
If the received value doesn't match any of our eBlockFace constants, BLOCK_FACE_NONE is returned. */
eBlockFace FaceIntToBlockFace(Int8 a_FaceInt);
eBlockFace FaceIntToBlockFace(Int32 a_FaceInt);
/** Sends the entity type and entity-dependent data required for the entity to initially spawn. */
virtual void SendEntitySpawn(const cEntity & a_Entity, const UInt8 a_ObjectType, const Int32 a_ObjectData);

20
src/Protocol/Protocol_1_9.cpp
View File

@ -1233,26 +1233,6 @@ void cProtocol_1_9_0::ParseItemMetadata(cItem & a_Item, const AString & a_Metada
eBlockFace cProtocol_1_9_0::FaceIntToBlockFace(Int32 a_BlockFace)
{
// Normalize the blockface values returned from the protocol
// Anything known gets mapped 1:1, everything else returns BLOCK_FACE_NONE
switch (a_BlockFace)
{
case BLOCK_FACE_XM: return BLOCK_FACE_XM;
case BLOCK_FACE_XP: return BLOCK_FACE_XP;
case BLOCK_FACE_YM: return BLOCK_FACE_YM;
case BLOCK_FACE_YP: return BLOCK_FACE_YP;
case BLOCK_FACE_ZM: return BLOCK_FACE_ZM;
case BLOCK_FACE_ZP: return BLOCK_FACE_ZP;
default: return BLOCK_FACE_NONE;
}
}
eHand cProtocol_1_9_0::HandIntToEnum(Int32 a_Hand)
{
// Convert hand parameter into eHand enum

4
src/Protocol/Protocol_1_9.h
View File

@ -97,10 +97,6 @@ protected:
/** Parses item metadata as read by ReadItem(), into the item enchantments. */
virtual void ParseItemMetadata(cItem & a_Item, const AString & a_Metadata) override;
/** Converts the BlockFace received by the protocol into eBlockFace constants.
If the received value doesn't match any of our eBlockFace constants, BLOCK_FACE_NONE is returned. */
eBlockFace FaceIntToBlockFace(Int32 a_FaceInt);
/** Converts the hand parameter received by the protocol into eHand constants.
If the received value doesn't match any of the know value, raise an assertion fail or return hMain. */
eHand HandIntToEnum(Int32 a_Hand);