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

Revert "update chat.Message to 1.20.4 format"

Browse Source 
This reverts commit 903d585177.
This commit is contained in:
Tnze
2024-04-27 20:27:23 +08:00
parent 0ff1876cc6
commit 902a910bd6
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
chat/message.go
View File

@ -20,7 +20,6 @@ import (
"strings"
en_us "github.com/Tnze/go-mc/data/lang/en-us"
"github.com/Tnze/go-mc/nbt"
pk "github.com/Tnze/go-mc/net/packet"
)
@ -134,26 +133,13 @@ func (m *Message) UnmarshalJSON(raw []byte) (err error) {
}
// ReadFrom decode Message in a ChatMsg packet
func (m *Message) ReadFrom(r io.Reader) (n int64, err error) {
var msgType pk.Byte
n, err = msgType.ReadFrom(r)
if err != nil {
return n, err
}
io.CopyN(io.Discard, r, 1)
func (m *Message) ReadFrom(r io.Reader) (int64, error) {
var code pk.String
n, err = code.ReadFrom(r)
n, err := code.ReadFrom(r)
if err != nil {
return n, err
}
if byte(msgType) == nbt.TagString {
m.Text = string(code)
} else if byte(msgType) == nbt.TagCompound {
fmt.Printf("a: %+v\n", []byte(code))
err = json.Unmarshal([]byte(code), m)
}
return n, err
}