falloutBot/go-mc
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change bot.JoinConn(*go-mc/net.Conn) to bot.JoinConn(net.Conn)

Browse Source
This commit is contained in:
Sunbread
2020-01-05 00:33:35 +08:00
parent 888c98a6d4
commit 933222faf5
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bot/mcbot.go
View File

@ -6,8 +6,9 @@ package bot
import ( import (
"fmt" "fmt"
"github.com/Tnze/go-mc/net" mcnet "github.com/Tnze/go-mc/net"
pk "github.com/Tnze/go-mc/net/packet" pk "github.com/Tnze/go-mc/net/packet"
"net"
) )
// ProtocolVersion , the protocol version number of minecraft net protocol // ProtocolVersion , the protocol version number of minecraft net protocol
@ -16,20 +17,20 @@ const ProtocolVersion = 575
// JoinServer connect a Minecraft server for playing the game. // JoinServer connect a Minecraft server for playing the game.
func (c *Client) JoinServer(addr string, port int) (err error) { func (c *Client) JoinServer(addr string, port int) (err error) {
//Connect //Connect
conn, err := net.DialMC(fmt.Sprintf("%s:%d", addr, port)) conn, err := mcnet.DialMC(fmt.Sprintf("%s:%d", addr, port))
if err != nil { if err != nil {
err = fmt.Errorf("bot: connect server fail: %v", err) err = fmt.Errorf("bot: connect server fail: %v", err)
return return
} }
//JoinConn //JoinConn
return c.JoinConn(conn) return c.JoinConn(conn.Socket)
} }
// JoinConn join a Minecraft server through a connection for playing the game. // JoinConn join a Minecraft server through a connection for playing the game.
func (c *Client) JoinConn(conn *net.Conn) (err error) { func (c *Client) JoinConn(conn net.Conn) (err error) {
//Set Conn //Set Conn
c.conn = conn c.conn = mcnet.WrapConn(conn)
//Get Addr //Get Addr
strform := c.conn.Socket.RemoteAddr().String() strform := c.conn.Socket.RemoteAddr().String()
@ -105,6 +106,6 @@ func (c *Client) JoinConn(conn *net.Conn) (err error) {
// Conn return the MCConn of the Client. // Conn return the MCConn of the Client.
// Only used when you want to handle the packets by yourself // Only used when you want to handle the packets by yourself
func (c *Client) Conn() *net.Conn { func (c *Client) Conn() *mcnet.Conn {
return c.conn return c.conn
} }