From 5141d05ba676df9584831ffa9ff6e8ff8905887d Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sat, 18 Jul 2020 18:57:23 +0100 Subject: Delete duplicated status request handlers Here we go again... --- src/Protocol/Protocol_1_12.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'src/Protocol/Protocol_1_12.h') diff --git a/src/Protocol/Protocol_1_12.h b/src/Protocol/Protocol_1_12.h index c1b81955a..266fc03bb 100644 --- a/src/Protocol/Protocol_1_12.h +++ b/src/Protocol/Protocol_1_12.h @@ -34,17 +34,17 @@ public: cProtocol_1_12(cClientHandle * a_Client, const AString &a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State); 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); virtual void HandleCraftRecipe(cByteBuffer & a_ByteBuffer); virtual void HandlePacketCraftingBookData(cByteBuffer & a_ByteBuffer); - virtual void HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer) override; virtual void WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_Entity) override; virtual void WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mob) override; - -protected: - - virtual UInt32 GetPacketID(ePacketType a_Packet) override; }; @@ -61,10 +61,12 @@ public: cProtocol_1_12_1(cClientHandle * a_Client, const AString &a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State); 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; - virtual void HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer) override; }; @@ -78,14 +80,13 @@ class cProtocol_1_12_2: public: - cProtocol_1_12_2(cClientHandle * a_Client, const AString & a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State): - Super(a_Client, a_ServerAddress, a_ServerPort, a_State) - { - } + cProtocol_1_12_2(cClientHandle * a_Client, const AString & a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State); protected: + + /** Returns 1.12.2. */ + virtual Version GetProtocolVersion() override; virtual void HandlePacketKeepAlive(cByteBuffer & a_ByteBuffer) override; - virtual void HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer) override; virtual void SendKeepAlive(UInt32 a_PingID) override; virtual void SendUnlockRecipe(UInt32 a_RecipeID) override; virtual void SendInitRecipes(UInt32 a_RecipeID) override; -- cgit v1.2.3