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

Doesn't convert UUID to string in ChatMsg event.

Browse Source
This commit is contained in:
Tnze
2020-07-09 13:51:21 +08:00
parent 0b3e6b01d5
commit b22ad870c3
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bot/event.go
View File

@ -3,13 +3,14 @@ package bot
import ( import (
"github.com/Tnze/go-mc/bot/world/entity" "github.com/Tnze/go-mc/bot/world/entity"
"github.com/Tnze/go-mc/chat" "github.com/Tnze/go-mc/chat"
"github.com/google/uuid"
pk "github.com/Tnze/go-mc/net/packet" pk "github.com/Tnze/go-mc/net/packet"
) )
type eventBroker struct { type eventBroker struct {
GameStart func() error GameStart func() error
ChatMsg func(msg chat.Message, pos byte, sender string) error ChatMsg func(msg chat.Message, pos byte, sender uuid.UUID) error
Disconnect func(reason chat.Message) error Disconnect func(reason chat.Message) error
HealthChange func() error HealthChange func() error
Die func() error Die func() error

3
bot/ingame.go
View File

@ -4,6 +4,7 @@ import (
"bytes" "bytes"
"errors" "errors"
"fmt" "fmt"
"github.com/google/uuid"
"io/ioutil" "io/ioutil"
"github.com/Tnze/go-mc/bot/world" "github.com/Tnze/go-mc/bot/world"
@ -285,7 +286,7 @@ func handleChatMessagePacket(c *Client, p pk.Packet) (err error) {
} }
if c.Events.ChatMsg != nil { if c.Events.ChatMsg != nil {
err = c.Events.ChatMsg(s, byte(pos), string(sender.Encode())) err = c.Events.ChatMsg(s, byte(pos), uuid.UUID(sender))
} }
return err return err

3
cmd/autofish/autofish.go
View File

@ -1,6 +1,7 @@
package main package main
import ( import (
"github.com/google/uuid"
"log" "log"
"time" "time"
@ -72,7 +73,7 @@ func onSound(name string, category int, x, y, z float64, volume, pitch float32)
return nil return nil
} }
func onChatMsg(c chat.Message, pos byte, uuid string) error { func onChatMsg(c chat.Message, pos byte, uuid uuid.UUID) error {
log.Println("Chat:", c) log.Println("Chat:", c)
return nil return nil
} }

3
cmd/daze/daze.go
View File

@ -2,6 +2,7 @@ package main
import ( import (
"bytes" "bytes"
"github.com/google/uuid"
"log" "log"
"github.com/Tnze/go-mc/bot" "github.com/Tnze/go-mc/bot"
@ -38,7 +39,7 @@ func onGameStart() error {
return nil //if err isn't nil, HandleGame() will return it. return nil //if err isn't nil, HandleGame() will return it.
} }
func onChatMsg(c chat.Message, pos byte, uuid string) error { func onChatMsg(c chat.Message, pos byte, uuid uuid.UUID) error {
log.Println("Chat:", c.ClearString()) // output chat message without any format code (like color or bold) log.Println("Chat:", c.ClearString()) // output chat message without any format code (like color or bold)
return nil return nil
} }