From 2b48f586aac6f15cb4e2c80bcf3a8eaeb8abda75 Mon Sep 17 00:00:00 2001 From: tycho Date: Sun, 8 Nov 2015 21:19:20 +0000 Subject: More Networking reffacor --- src/Protocol/Protocol17x.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/Protocol/Protocol17x.h') diff --git a/src/Protocol/Protocol17x.h b/src/Protocol/Protocol17x.h index 8e85880b3..cd7cc22c5 100644 --- a/src/Protocol/Protocol17x.h +++ b/src/Protocol/Protocol17x.h @@ -41,6 +41,7 @@ namespace Json { class Value; } +class cDataSender; @@ -144,14 +145,9 @@ protected: typedef std::vector> ActionList; - AString m_ServerAddress; - - UInt16 m_ServerPort; AString m_AuthServerID; - /** State of the protocol. 1 = status, 2 = login, 3 = game */ - UInt32 m_State; /** The dimension that was last sent to a player in a Respawn or Login packet. Used to avoid Respawning into the same dimension, which confuses the client. */ @@ -197,10 +193,10 @@ protected: /** Parses Vanilla plugin messages into specific ClientHandle calls. The message payload is still in the bytebuffer, to be read by this function. */ - void HandleVanillaPluginMessage(cByteBuffer & a_ByteBuffer, const AString & a_Channel, UInt16 a_PayloadLength); + cProtocolError HandleVanillaPluginMessage(cByteBuffer & a_ByteBuffer, const AString & a_Channel, UInt16 a_PayloadLength, ActionList & a_Action) WARN_UNUSED; /** Sends the data to the client, encrypting them if needed. */ - //virtual void SendData(cByteBuffer & a_Buffer, const char * a_Data, size_t a_Size) override; + virtual void SendData(const char * a_Data, size_t a_Size) override; /** Sends the packet to the client. Called by the cPacketizer's destructor. */ virtual void SendPacket(cPacketizer & a_Packet) override; -- cgit v1.2.3