fix a crash

bedrock-tool · Jun 23, 2024 · bda9a6c · bda9a6c
1 parent 2bf9725
commit bda9a6c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "dragonfly"]
 	path = dragonfly
 	url = https://github.com/olebeck/dragonfly.git
+[submodule "go-raknet"]
+	path = go-raknet
+	url = git@github.com:olebeck/go-raknet
diff --git a/go-raknet b/go-raknet
diff --git a/go.work b/go.work
@@ -5,5 +5,6 @@ toolchain go1.21.4
 use (
 	.
 	./dragonfly
+	./go-raknet
 	./gophertunnel
 )
diff --git a/gophertunnel b/gophertunnel
diff --git a/utils/proxy/conn.go b/utils/proxy/conn.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net"
+	"time"
 
 	"github.com/bedrock-tool/bedrocktool/locale"
 	"github.com/bedrock-tool/bedrocktool/ui/messages"
@@ -74,7 +75,7 @@ func (p *Context) connectServer(ctx context.Context) (err error) {
 		return err
 	}
 
-	server, err := d.DialContext(ctx, "raknet", p.serverAddress)
+	server, err := d.DialContext(ctx, "raknet", p.serverAddress, 10*time.Second)
 	if err != nil {
 		return err
 	}

diff --git a/utils/proxy/context.go b/utils/proxy/context.go
@@ -295,7 +295,9 @@ func (p *Context) onServerConnect() error {
 func (p *Context) doSession(ctx context.Context, cancel context.CancelCauseFunc) (err error) {
 	defer func() {
 		for _, handler := range p.handlers {
-			handler.OnSessionEnd()
+			if handler.OnSessionEnd != nil {
+				handler.OnSessionEnd()
+			}
 		}
 	}()