server: Fix persona premium skins by setting correct skin full id (#1118)

Author: didntpot

server/player/skin/skin.go

@@ -13,6 +13,7 @@ type Skin struct {
 	// Persona specifies if the skin uses the persona skin system.
 	Persona   bool
 	PlayFabID string
+	FullID    string
 
 	// Pix holds the raw pixel data of the skin. This is an RGBA byte slice, meaning that every first byte is
 	// a Red value, the second a Green value, the third a Blue value and the fourth an Alpha value.

server/server.go

@@ -594,7 +594,7 @@ func (srv *Server) createWorld(dim world.Dimension, nether, end **world.World) *
 	return w
 }
 
-// parseSkin parses a skin from the login.ClientData  and returns it.
+// parseSkin parses a skin from the login.ClientData and returns it.
 func (srv *Server) parseSkin(data login.ClientData) skin.Skin {
 	// Gophertunnel guarantees the following values are valid data and are of
 	// the correct size.
@@ -606,6 +606,7 @@ func (srv *Server) parseSkin(data login.ClientData) skin.Skin {
 	playerSkin.Model, _ = base64.StdEncoding.DecodeString(data.SkinGeometry)
 	playerSkin.ModelConfig, _ = skin.DecodeModelConfig(skinResourcePatch)
 	playerSkin.PlayFabID = data.PlayFabID
+	playerSkin.FullID = data.SkinID
 
 	playerSkin.Cape = skin.NewCape(data.CapeImageWidth, data.CapeImageHeight)
 	playerSkin.Cape.Pix, _ = base64.StdEncoding.DecodeString(data.CapeData)

server/session/player.go

@@ -3,9 +3,6 @@ package session
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/df-mc/dragonfly/server/player/debug"
-	"github.com/df-mc/dragonfly/server/player/hud"
-	"github.com/go-gl/mathgl/mgl32"
 	"image/color"
 	"maps"
 	"math"
@@ -21,10 +18,13 @@ import (
 	"github.com/df-mc/dragonfly/server/item/creative"
 	"github.com/df-mc/dragonfly/server/item/inventory"
 	"github.com/df-mc/dragonfly/server/item/recipe"
+	"github.com/df-mc/dragonfly/server/player/debug"
 	"github.com/df-mc/dragonfly/server/player/dialogue"
 	"github.com/df-mc/dragonfly/server/player/form"
+	"github.com/df-mc/dragonfly/server/player/hud"
 	"github.com/df-mc/dragonfly/server/player/skin"
 	"github.com/df-mc/dragonfly/server/world"
+	"github.com/go-gl/mathgl/mgl32"
 	"github.com/go-gl/mathgl/mgl64"
 	"github.com/google/uuid"
 	"github.com/sandertv/gophertunnel/minecraft/protocol"
@@ -1084,6 +1084,7 @@ func protocolToSkin(sk protocol.Skin) (s skin.Skin, err error) {
 	s.Pix = sk.SkinData
 	s.Model = sk.SkinGeometry
 	s.PlayFabID = sk.PlayFabID
+	s.FullID = sk.FullID
 
 	s.Cape = skin.NewCape(int(sk.CapeImageWidth), int(sk.CapeImageHeight))
 	s.Cape.Pix = sk.CapeData

server/session/session_list.go

@@ -1,13 +1,14 @@
 package session
 
 import (
+	"slices"
+	"sync"
+
 	"github.com/df-mc/dragonfly/server/internal/sliceutil"
 	"github.com/df-mc/dragonfly/server/player/skin"
 	"github.com/google/uuid"
 	"github.com/sandertv/gophertunnel/minecraft/protocol"
 	"github.com/sandertv/gophertunnel/minecraft/protocol/packet"
-	"slices"
-	"sync"
 )
 
 var sessions = new(sessionList)
@@ -125,7 +126,7 @@ func skinToProtocol(s skin.Skin) protocol.Skin {
 		SkinGeometry:              s.Model,
 		PersonaSkin:               s.Persona,
 		CapeID:                    uuid.New().String(),
-		FullID:                    uuid.New().String(),
+		FullID:                    s.FullID,
 		Animations:                animations,
 		Trusted:                   true,
 		OverrideAppearance:        true,