From b2a5f7b72061110d9e6de83b7f501548ff10cdd9 Mon Sep 17 00:00:00 2001
From: Sunbread <sunbread233@gmail.com>
Date: Sat, 4 Jan 2020 23:44:58 +0800
Subject: [PATCH] Add bot.JoinConn()

---
 bot/mcbot.go | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/bot/mcbot.go b/bot/mcbot.go
index e45c4c1..1d4f70a 100644
--- a/bot/mcbot.go
+++ b/bot/mcbot.go
@@ -16,12 +16,27 @@ const ProtocolVersion = 575
 // JoinServer connect a Minecraft server for playing the game.
 func (c *Client) JoinServer(addr string, port int) (err error) {
 	//Connect
-	c.conn, err = net.DialMC(fmt.Sprintf("%s:%d", addr, port))
+	conn, err := net.DialMC(fmt.Sprintf("%s:%d", addr, port))
 	if err != nil {
 		err = fmt.Errorf("bot: connect server fail: %v", err)
 		return
 	}
 
+	//JoinConn
+	return c.JoinConn(conn)
+}
+
+// JoinConn join a Minecraft server through a connection for playing the game.
+func (c *Client) JoinConn(conn *net.Conn) (err error) {
+	//Set Conn
+	c.conn = conn
+
+	//Get Addr
+	strform := c.conn.Socket.RemoteAddr().String()
+	var addr string
+	var port int
+	fmt.Sscanf(strform, "%s:%d", &addr, &port)
+
 	//Handshake
 	err = c.conn.WritePacket(
 		//Handshake Packet