summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@outlook.com>2020-07-20 00:11:02 +0200
committerTiger Wang <ziwei.tiger@outlook.com>2020-07-20 00:11:02 +0200
commit2f30e98daee76e580ffbe36714ee82d17ac6ab50 (patch)
tree4bb1ab49d1a0f1c3c243179ed763691625bd4c09
parentRemove ProtocolPalettes (diff)
downloadcuberite-2f30e98daee76e580ffbe36714ee82d17ac6ab50.tar
cuberite-2f30e98daee76e580ffbe36714ee82d17ac6ab50.tar.gz
cuberite-2f30e98daee76e580ffbe36714ee82d17ac6ab50.tar.bz2
cuberite-2f30e98daee76e580ffbe36714ee82d17ac6ab50.tar.lz
cuberite-2f30e98daee76e580ffbe36714ee82d17ac6ab50.tar.xz
cuberite-2f30e98daee76e580ffbe36714ee82d17ac6ab50.tar.zst
cuberite-2f30e98daee76e580ffbe36714ee82d17ac6ab50.zip
Diffstat (limited to '')
-rw-r--r--src/Protocol/Protocol_1_10.h1
-rw-r--r--src/Protocol/Protocol_1_11.h1
-rw-r--r--src/Protocol/Protocol_1_12.h3
-rw-r--r--src/Protocol/Protocol_1_13.h6
4 files changed, 4 insertions, 7 deletions
diff --git a/src/Protocol/Protocol_1_10.h b/src/Protocol/Protocol_1_10.h
index de968ce2f..46e7f7b04 100644
--- a/src/Protocol/Protocol_1_10.h
+++ b/src/Protocol/Protocol_1_10.h
@@ -32,7 +32,6 @@ protected:
virtual void SendSoundEffect(const AString & a_SoundName, double a_X, double a_Y, double a_Z, float a_Volume, float a_Pitch) override;
- /** Returns 1.10. */
virtual Version GetProtocolVersion() override;
virtual void HandlePacketResourcePackStatus(cByteBuffer & a_ByteBuffer) override;
virtual void WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_Entity) override;
diff --git a/src/Protocol/Protocol_1_11.h b/src/Protocol/Protocol_1_11.h
index 86abaea6b..4c0d8a22a 100644
--- a/src/Protocol/Protocol_1_11.h
+++ b/src/Protocol/Protocol_1_11.h
@@ -66,6 +66,5 @@ public:
protected:
- /** Returns 1.11.1. */
virtual Version GetProtocolVersion() override;
};
diff --git a/src/Protocol/Protocol_1_12.h b/src/Protocol/Protocol_1_12.h
index b0423f56c..42c8483c4 100644
--- a/src/Protocol/Protocol_1_12.h
+++ b/src/Protocol/Protocol_1_12.h
@@ -37,7 +37,6 @@ protected:
virtual UInt32 GetPacketID(ePacketType a_Packet) override;
- /** Returns 1.12. */
virtual Version GetProtocolVersion() override;
virtual bool HandlePacket(cByteBuffer & a_ByteBuffer, UInt32 a_PacketType) override;
virtual void HandlePacketAdvancementTab(cByteBuffer & a_ByteBuffer);
@@ -64,7 +63,6 @@ protected:
virtual UInt32 GetPacketID(ePacketType a_Packet) override;
- /** Returns 1.12.1. */
virtual Version GetProtocolVersion() override;
virtual bool HandlePacket(cByteBuffer & a_ByteBuffer, UInt32 a_PacketType) override;
};
@@ -84,7 +82,6 @@ public:
protected:
- /** Returns 1.12.2. */
virtual Version GetProtocolVersion() override;
virtual void HandlePacketKeepAlive(cByteBuffer & a_ByteBuffer) override;
virtual void SendKeepAlive(UInt32 a_PingID) override;
diff --git a/src/Protocol/Protocol_1_13.h b/src/Protocol/Protocol_1_13.h
index 189dff903..80d086597 100644
--- a/src/Protocol/Protocol_1_13.h
+++ b/src/Protocol/Protocol_1_13.h
@@ -5,6 +5,10 @@
Declares the 1.13 protocol classes:
- cProtocol_1_13
- release 1.13 protocol (#393)
+ - cProtocol_1_13_1
+ - release 1.13.1 protocol (#401)
+ - cProtocol_1_13_2
+ - release 1.13.2 protocol (#404)
(others may be added later in the future for the 1.13 release series)
*/
@@ -96,7 +100,6 @@ protected:
virtual void SendBlockChange(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;
virtual void SendBlockChanges(int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes) override;
- /** Returns 1.13.1 */
virtual Version GetProtocolVersion() override;
virtual std::pair<short, short> GetItemFromProtocolID(UInt32 a_ProtocolID) override;
virtual UInt32 GetProtocolIDFromItem(short a_ItemID, short a_ItemDamage) override;
@@ -117,7 +120,6 @@ public:
protected:
- /** Returns 1.13.2 */
virtual Version GetProtocolVersion() override;
virtual bool ReadItem(cByteBuffer & a_ByteBuffer, cItem & a_Item, size_t a_KeepRemainingBytes) override;
virtual void WriteItem(cPacketizer & a_Pkt, const cItem & a_Item) override;