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

Use %w in file ingame.go and nbt package, then we can use errors.Is for compare

Browse Source
This commit is contained in:
Tnze
2020-03-04 12:37:43 +08:00
parent 7defd6062c
commit a908a03fcd
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bot/ingame.go
View File

@ -37,12 +37,12 @@ func (c *Client) HandleGame() error {
//Read packets //Read packets
p, err := c.conn.ReadPacket() p, err := c.conn.ReadPacket()
if err != nil { if err != nil {
return fmt.Errorf("bot: read packet fail: %v", err) return fmt.Errorf("bot: read packet fail: %w", err)
} }
//handle packets //handle packets
disconnect, err := c.handlePacket(p) disconnect, err := c.handlePacket(p)
if err != nil { if err != nil {
return fmt.Errorf("handle packet 0x%X error: %v", p.ID, err) return fmt.Errorf("handle packet 0x%X error: %w", p.ID, err)
} }
if disconnect { if disconnect {
return nil return nil
@ -452,7 +452,7 @@ func handleChunkDataPacket(c *Client, p pk.Packet) error {
} }
chunk, err := world.DecodeChunkColumn(int32(PrimaryBitMask), Data) chunk, err := world.DecodeChunkColumn(int32(PrimaryBitMask), Data)
if err != nil { if err != nil {
return fmt.Errorf("decode chunk column fail: %v", err) return fmt.Errorf("decode chunk column fail: %w", err)
} }
c.Wd.LoadChunk(int(X), int(Z), chunk) c.Wd.LoadChunk(int(X), int(Z), chunk)

4
nbt/read.go
View File

@ -23,7 +23,7 @@ func (d *Decoder) Decode(v interface{}) error {
//start read NBT //start read NBT
tagType, tagName, err := d.readTag() tagType, tagName, err := d.readTag()
if err != nil { if err != nil {
return fmt.Errorf("nbt: %v", err) return fmt.Errorf("nbt: %w", err)
} }
if c := d.checkCompressed(tagType); c != "" { if c := d.checkCompressed(tagType); c != "" {
@ -32,7 +32,7 @@ func (d *Decoder) Decode(v interface{}) error {
err = d.unmarshal(val.Elem(), tagType, tagName) err = d.unmarshal(val.Elem(), tagType, tagName)
if err != nil { if err != nil {
return fmt.Errorf("nbt: %v", err) return fmt.Errorf("nbt: %w", err)
} }
return nil return nil
} }