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

Decode ChatMsg as chat.Message but not pk.String

Browse Source
This commit is contained in:
JunDao
2019-05-02 12:18:00 +08:00
parent 1f0bdf19a3
commit c74cffcc22
4 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
bot/ingame.go
View File

@ -150,22 +150,14 @@ func (c *Client) handlePacket(p pk.Packet) (disconnect bool, err error) {
// }
func handleDisconnectPacket(c *Client, p pk.Packet) error {
var rowReason pk.String
err := p.Scan(&rowReason)
var reason chat.Message
err := p.Scan(&reason)
if err != nil {
return err
}
if c.Events.Disconnect != nil {
var reason chat.Message
err := reason.UnmarshalJSON([]byte(rowReason))
if err != nil {
return err
}
return c.Events.Disconnect(reason)
}
return nil
return c.Events.Disconnect(reason)
}
// func handleSetSlotPacket(g *Client, r *bytes.Reader) error {
@ -259,21 +251,19 @@ func handleDisconnectPacket(c *Client, p pk.Packet) error {
// return nil
// }
func handleChatMessagePacket(c *Client, p pk.Packet) error {
func handleChatMessagePacket(c *Client, p pk.Packet) (err error) {
var (
s pk.String
s chat.Message
pos pk.Byte
)
if err := p.Scan(&s, &pos); err != nil {
err = p.Scan(&s, &pos)
if err != nil {
return err
}
var cm chat.Message
err := cm.UnmarshalJSON([]byte(s))
if err == nil && c.Events.ChatMsg != nil {
err = c.Events.ChatMsg(cm)
if c.Events.ChatMsg != nil {
err = c.Events.ChatMsg(s)
}
return err

3
bot/login.go
View File

@ -10,7 +10,6 @@ import (
"crypto/x509"
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net/http"
"strings"
@ -63,7 +62,7 @@ type encryptionRequest struct {
VerifyToken []byte
}
func (e *encryptionRequest) Decode(r io.ByteReader) error {
func (e *encryptionRequest) Decode(r pk.ComByteReader) error {
var serverID pk.String
if err := serverID.Decode(r); err != nil {
return err