From 4068ebe6dd7f8ea2199395b496f92d67341be2b7 Mon Sep 17 00:00:00 2001
From: Tnze <cjd001113@outlook.com>
Date: Fri, 9 Dec 2022 00:19:34 +0800
Subject: [PATCH] Fix login for 1.19.3

---
 bot/mcbot.go     | 10 ++--------
 server/server.go |  4 ++--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/bot/mcbot.go b/bot/mcbot.go
index 52f5630..9baf20c 100644
--- a/bot/mcbot.go
+++ b/bot/mcbot.go
@@ -20,7 +20,7 @@ import (
 
 // ProtocolVersion is the protocol version number of minecraft net protocol
 const (
-	ProtocolVersion = 760
+	ProtocolVersion = 761
 	DefaultPort     = mcnet.DefaultPort
 )
 
@@ -98,21 +98,16 @@ func (c *Client) join(addr string, options JoinOptions) error {
 		pk.VarInt(ProtocolVersion), // Protocol version
 		pk.String(host),            // Host
 		pk.UnsignedShort(port),     // Port
-		pk.Byte(2),
+		pk.VarInt(2),
 	))
 	if err != nil {
 		return LoginErr{"handshake", err}
 	}
 	// Login Start
-	var KeyPair pk.OptionEncoder[*user.KeyPairResp]
 	if c.Auth.AsTk != "" && !options.NoPublicKey {
 		if options.KeyPair != nil {
-			KeyPair.Has = true
-			KeyPair.Val = options.KeyPair
 			c.KeyPair = options.KeyPair
 		} else if KeyPairResp, err := user.GetOrFetchKeyPair(c.Auth.AsTk); err == nil {
-			KeyPair.Has = true
-			KeyPair.Val = &KeyPairResp
 			c.KeyPair = &KeyPairResp
 		}
 	}
@@ -124,7 +119,6 @@ func (c *Client) join(addr string, options JoinOptions) error {
 	err = c.Conn.WritePacket(pk.Marshal(
 		packetid.LoginStart,
 		pk.String(c.Auth.Name),
-		KeyPair,
 		PlayerUUID,
 	))
 	if err != nil {
diff --git a/server/server.go b/server/server.go
index 7f801ab..d57f4c5 100644
--- a/server/server.go
+++ b/server/server.go
@@ -38,8 +38,8 @@ import (
 )
 
 const (
-	ProtocolName    = "1.19.2"
-	ProtocolVersion = 760
+	ProtocolName    = "1.19.3"
+	ProtocolVersion = 761
 )
 
 type Server struct {