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

fix VarInt written bytes counting problem. And add some comments.

Browse Source
This commit is contained in:
Tnze
2023-04-01 09:52:12 +08:00
parent a8f9c4bee5
commit 90501f1357
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
net/packet/types.go
View File

@ -252,12 +252,14 @@ func (l *Long) ReadFrom(r io.Reader) (n int64, err error) {
} }
func (v VarInt) WriteTo(w io.Writer) (n int64, err error) { func (v VarInt) WriteTo(w io.Writer) (n int64, err error) {
vi := make([]byte, MaxVarIntLen) var vi [MaxVarIntLen]byte
nn := v.WriteToBytes(vi) nn := v.WriteToBytes(vi[:])
_, err = w.Write(vi[:nn]) nn, err = w.Write(vi[:nn])
return int64(nn), err return int64(nn), err
} }
// WriteToBytes encodes the VarInt into buf and returns the number of bytes written.
// If the buffer is too small, WriteToBytes will panic.
func (v VarInt) WriteToBytes(buf []byte) int { func (v VarInt) WriteToBytes(buf []byte) int {
num := uint32(v) num := uint32(v)
i := 0 i := 0
@ -297,6 +299,7 @@ func (v *VarInt) ReadFrom(r io.Reader) (n int64, err error) {
return return
} }
// Len returns the number of bytes required to encode the VarInt.
func (v VarInt) Len() int { func (v VarInt) Len() int {
switch { switch {
case v < 0: case v < 0:
@ -315,12 +318,14 @@ func (v VarInt) Len() int {
} }
func (v VarLong) WriteTo(w io.Writer) (n int64, err error) { func (v VarLong) WriteTo(w io.Writer) (n int64, err error) {
vi := make([]byte, MaxVarLongLen) var vi [MaxVarLongLen]byte
nn := v.WriteToBytes(vi) nn := v.WriteToBytes(vi[:])
_, err = w.Write(vi[:nn]) nn, err = w.Write(vi[:nn])
return int64(nn), err return int64(nn), err
} }
// WriteToBytes encodes the VarLong into buf and returns the number of bytes written.
// If the buffer is too small, WriteToBytes will panic.
func (v VarLong) WriteToBytes(buf []byte) int { func (v VarLong) WriteToBytes(buf []byte) int {
num := uint64(v) num := uint64(v)
i := 0 i := 0
@ -359,6 +364,7 @@ func (v *VarLong) ReadFrom(r io.Reader) (n int64, err error) {
return return
} }
// Len returns the number of bytes required to encode the VarLong.
func (v VarLong) Len() int { func (v VarLong) Len() int {
switch { switch {
case v < 0: case v < 0: