block state

server/login_server.go

@@ -15,7 +15,7 @@ import (
 	"github.com/google/uuid"
 )
 
-var StatusServedError = errors.New("status served")
+var StatusServedErr = errors.New("status served")
 
 var UnexpectedStatusRequest = UnexpectedNextStateError{proto_base.Status}
 
@@ -59,7 +59,7 @@ func (l *LoginServer) OnHandshake(packet *v1_21_8.HandshakingToServerPacketSetPr
 	}
 
 	if len(l.CompatibleVersions) != 0 && !slices.Contains(l.CompatibleVersions, packet.ProtocolVersion) {
-		err = fmt.Errorf("incompatible protocol version please use one of %v you can look up the real coresponding version at https://minecraft.wiki/w/Minecraft_Wiki:Projects/wiki.vg_merge/Protocol_version_numbers", l.CompatibleVersions)
+		err = fmt.Errorf("incompatible protocol version please use one of %v you can look up the real corresponding version at https://minecraft.wiki/w/Minecraft_Wiki:Projects/wiki.vg_merge/Protocol_version_numbers", l.CompatibleVersions)
 		return
 	}
 
@@ -76,7 +76,7 @@ func (l *LoginServer) OnStatusPing(packet *v1_21_8.StatusToServerPacketPing) (er
 	if err != nil {
 		return
 	}
-	return event.HandlerDoneErr{Return: StatusServedError}
+	return event.HandlerDoneErr{Return: StatusServedErr}
 }
 
 func (l *LoginServer) SetCompressionThreshold(threshold int32) (err error) {

server/server.go

@@ -1,6 +1,7 @@
 package server
 
 import (
+	"errors"
 	"log/slog"
 	"net"
 
@@ -21,13 +22,24 @@ func Servee(c net.Conn) (ret *proto.Conn) {
 	return
 }
 
-func ServeClient(cNet net.Conn, factory func(c *proto.Conn) (h any, err error)) (err error) {
+func ServeClient(cNet net.Conn, factory func(c *proto.Conn) (h any, err error)) {
 	c := Servee(cNet)
+	defer c.Close()
 	h, err := factory(c)
 	if err != nil {
 		return
 	}
 	err = c.Start(h)
+	if errors.Is(err, StatusServedErr) {
+		return
+	}
+	if err != nil {
+		slog.Error("Error while handling client", "error", err, "client", c.Conn.RemoteAddr())
+		err = Kick(c, text.Pretty(err.Error()))
+		if err != nil {
+			slog.Error("Error while kicking client", "error", err, "client", c.Conn.RemoteAddr())
+		}
+	}
 	return
 }
 
@@ -42,12 +54,7 @@ func StartServerWithFactory(listenAddr string, factory func(c *proto.Conn) (h an
 		if err != nil {
 			return
 		}
-		go func() {
-			err := ServeClient(cNet, factory)
-			if err != nil {
-				slog.Error("error while serving client", "error", err, "client", cNet.RemoteAddr())
-			}
-		}()
+		go ServeClient(cNet, factory)
 	}
 }