session/handler_server_bound_loading_screen.go: Allow empty/0 screen IDs

df-mc · Aug 15, 2024 · 1fe983b · 1fe983b
1 parent 408171b
commit 1fe983b
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/server/session/handler_server_bound_loading_screen.go b/server/session/handler_server_bound_loading_screen.go
@@ -16,12 +16,9 @@ type ServerBoundLoadingScreenHandler struct {
 // Handle ...
 func (h *ServerBoundLoadingScreenHandler) Handle(p packet.Packet, s *Session) error {
 	pk := p.(*packet.ServerBoundLoadingScreen)
-	if h.expectedID.Load() == 0 {
-		return fmt.Errorf("unexpected loading screen packet")
-	}
 	v, ok := pk.LoadingScreenID.Value()
-	if !ok {
-		return fmt.Errorf("expected loading screen ID %d, got nothing", h.expectedID.Load())
+	if !ok || h.expectedID.Load() == 0 {
+		return nil
 	} else if v != h.expectedID.Load() {
 		return fmt.Errorf("expected loading screen ID %d, got %d", h.expectedID.Load(), v)
 	} else if pk.Type == packet.LoadingScreenTypeEnd {