update to 1.18.2 & fix bug in snbt encoding

2022-03-10 12:29:03 +08:00
parent 0bbd279dd1
commit 46b021e1ef
18 changed files with 70 additions and 2147 deletions
--- a/net/conn.go
+++ b/net/conn.go
@ -63,11 +63,11 @@ func DialMCTimeout(addr string, timeout time.Duration) (*Conn, error) {
 }

 type Dialer struct {
-	*net.Dialer
+	net.Dialer
 }

 func (d *Dialer) resolver() *net.Resolver {
-	if d.Resolver != nil {
+	if d != nil && d.Resolver != nil {
 		return d.Resolver
 	}
 	return net.DefaultResolver