From 902a910bd68333b761825eb74f12b9eb308f9c74 Mon Sep 17 00:00:00 2001 From: Tnze Date: Sat, 27 Apr 2024 20:27:23 +0800 Subject: [PATCH] Revert "update chat.Message to 1.20.4 format" This reverts commit 903d585177b31253ebcd7ca0f2a7b79222c9b6a6. --- chat/message.go | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/chat/message.go b/chat/message.go index 28d4fb5..0f0ff7c 100644 --- a/chat/message.go +++ b/chat/message.go @@ -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) - } + err = json.Unmarshal([]byte(code), m) return n, err }