Merge pull request minekube#884 from minekube/fix/resourcepack-response-without-queued-pack

fix(java): ignore untracked modern resource pack responses

Author: robinbraemer

pkg/edition/java/proxy/internal/resourcepack/handler_modern.go

@@ -149,16 +149,18 @@ func (m *modernHandler) OnResourcePackResponse(bundle *ResponseBundle) (bool, er
 		}
 	}
 
-	e := newPlayerResourcePackStatusEvent(m.player, bundle.Status, queued.ID, *queued)
-	event.FireParallel(m.eventMgr, e, func(e *PlayerResourcePackStatusEvent) {
-		if e.Status() == packet.DeclinedResourcePackResponseStatus &&
-			e.PackInfo().ShouldForce &&
-			!e.OverwriteKick() {
-			m.player.Disconnect(&component.Translation{
-				Key: "multiplayer.requiredTexturePrompt.disconnect",
-			})
-		}
-	})
+	if queued != nil {
+		e := newPlayerResourcePackStatusEvent(m.player, bundle.Status, id, *queued)
+		event.FireParallel(m.eventMgr, e, func(e *PlayerResourcePackStatusEvent) {
+			if e.Status() == packet.DeclinedResourcePackResponseStatus &&
+				e.PackInfo().ShouldForce &&
+				!e.OverwriteKick() {
+				m.player.Disconnect(&component.Translation{
+					Key: "multiplayer.requiredTexturePrompt.disconnect",
+				})
+			}
+		})
+	}
 
 	switch bundle.Status {
 	// The player has accepted the resource pack and will proceed to download it.

pkg/edition/java/proxy/internal/resourcepack/handler_modern_test.go

@@ -0,0 +1,38 @@
+package resourcepack
+
+import (
+	"testing"
+
+	"github.com/robinbraemer/event"
+	"go.minekube.com/common/minecraft/component"
+	"go.minekube.com/gate/pkg/edition/java/proto/packet"
+	"go.minekube.com/gate/pkg/edition/java/proto/state"
+	"go.minekube.com/gate/pkg/edition/java/proto/version"
+	"go.minekube.com/gate/pkg/gate/proto"
+	"go.minekube.com/gate/pkg/util/uuid"
+)
+
+type testPlayer struct{}
+
+func (testPlayer) ID() uuid.UUID                          { return uuid.New() }
+func (testPlayer) WritePacket(proto.Packet) error         { return nil }
+func (testPlayer) BundleHandler() *BundleDelimiterHandler { return nil }
+func (testPlayer) State() *state.Registry                 { return state.Play }
+func (testPlayer) Protocol() proto.Protocol               { return version.Minecraft_1_20_3.Protocol }
+func (testPlayer) BackendInFlight() proto.PacketWriter    { return nil }
+func (testPlayer) Disconnect(component.Component)         {}
+
+func TestModernHandlerIgnoresUntrackedResourcePackResponse(t *testing.T) {
+	h := newModernHandler(testPlayer{}, event.Nop)
+
+	handled, err := h.OnResourcePackResponse(&ResponseBundle{
+		ID:     uuid.New(),
+		Status: packet.SuccessfulResourcePackResponseStatus,
+	})
+	if err != nil {
+		t.Fatalf("OnResourcePackResponse returned error: %v", err)
+	}
+	if handled {
+		t.Fatal("OnResourcePackResponse handled untracked response")
+	}
+}