minecraft/protocol.go: Fixed bug causing server to still read all pac…

…kets.
Sandertv · Sep 5, 2023 · daa1201 · daa1201
1 parent 46eecd9
commit daa1201
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/minecraft/packet.go b/minecraft/packet.go
@@ -34,7 +34,7 @@ type unknownPacketError struct {
 }
 
 func (err unknownPacketError) Error() string {
-	return fmt.Sprintf("unknown packet with ID %v", err.id)
+	return fmt.Sprintf("unexpected packet with ID %v", err.id)
 }
 
 // decode decodes the packet payload held in the packetData and returns the packet.Packet decoded.
@@ -46,11 +46,7 @@ func (p *packetData) decode(conn *Conn) (pks []packet.Packet, err error) {
 		if err == nil {
 			return
 		}
-		if _, ok := err.(unknownPacketError); ok {
-			if conn.disconnectOnUnknownPacket {
-				_ = conn.Close()
-			}
-		} else if conn.disconnectOnInvalidPacket {
+		if _, ok := err.(unknownPacketError); ok || conn.disconnectOnInvalidPacket {
 			_ = conn.Close()
 		}
 	}()

diff --git a/minecraft/protocol.go b/minecraft/protocol.go
@@ -57,7 +57,7 @@ func (proto) ID() int32     { return protocol.CurrentProtocol }
 func (p proto) Ver() string { return protocol.CurrentVersion }
 func (p proto) Packets(listener bool) packet.Pool {
 	if listener {
-		packet.NewClientPool()
+		return packet.NewClientPool()
 	}
 	return packet.NewServerPool()
 }