fix a lot of player apply skin from server issues

basic hand + inventory
after re-login event

Author: zardoy

renderer/viewer/three/entities.ts

@@ -276,6 +276,7 @@ export class Entities {
 
       void this.updatePlayerSkin(playerData.id, playerData.username, playerData.uuid ?? undefined, stevePngUrl)
     }
+    this.playerEntity.originalEntity = { ...playerData, name: 'player' } as SceneEntity['originalEntity']
 
     // Update position and rotation
     if (playerData.position) {
@@ -294,6 +295,7 @@ export class Entities {
       disposeObject(mesh)
     }
     this.entities = {}
+    this.currentSkinUrls = {}
 
     // Clean up player entity
     if (this.playerEntity) {
@@ -481,6 +483,7 @@ export class Entities {
   }
 
   uuidPerSkinUrlsCache = {} as Record<string, { skinUrl?: string, capeUrl?: string }>
+  currentSkinUrls = {} as Record<string, string>
 
   private isCanvasBlank (canvas: HTMLCanvasElement): boolean {
     return !canvas.getContext('2d')
@@ -517,6 +520,25 @@ export class Entities {
     }
 
     if (typeof skinUrl !== 'string') throw new Error('Invalid skin url')
+
+    // Skip if same skin URL is already loaded for this entity
+    if (this.currentSkinUrls[String(entityId)] === skinUrl) {
+      // Still handle cape if needed
+      if (capeUrl) {
+        if (capeUrl === true && username) {
+          const newCapeUrl = await loadSkinFromUsername(username, 'cape')
+          if (!this.getPlayerObject(entityId)) return
+          if (!newCapeUrl) return
+          capeUrl = newCapeUrl
+        }
+        if (typeof capeUrl === 'string') {
+          void this.loadAndApplyCape(entityId, capeUrl)
+        }
+      }
+      return
+    }
+
+    this.currentSkinUrls[String(entityId)] = skinUrl
     const renderEars = this.worldRenderer.worldRendererConfig.renderEars || username === 'deadmau5'
     void this.loadAndApplySkin(entityId, skinUrl, renderEars).then(async () => {
       if (capeUrl) {
@@ -1155,6 +1177,7 @@ export class Entities {
   playerPerAnimation = {} as Record<number, string>
   onRemoveEntity (entity: import('prismarine-entity').Entity) {
     this.loadedSkinEntityIds.delete(entity.id.toString())
+    delete this.currentSkinUrls[entity.id.toString()]
   }
 
   updateMap (mapNumber: string | number, data: string) {

src/entities.ts

@@ -237,16 +237,10 @@ customEvents.on('gameLoaded', () => {
       const skinUrl = applySkinTexturesProxy(player.skinData.url)
       const capeUrl = applySkinTexturesProxy((player.skinData as any).capeUrl)
 
-      // Find entity with matching UUID and update skin
-      let entityId = ''
-      for (const [entId, entity] of Object.entries(bot.entities)) {
-        if (entity.uuid === player.uuid) {
-          entityId = entId
-          break
-        }
+      void getThreeJsRendererMethods()!.updatePlayerSkin(player.entity?.id ?? '', player.username, player.uuid, skinUrl ?? true, capeUrl)
+      if (player.entity === bot.entity) {
+        appViewer.playerState.reactive.playerSkin = skinUrl
       }
-      // even if not found, still record to cache
-      void getThreeJsRendererMethods()!.updatePlayerSkin(entityId, player.username, player.uuid, skinUrl ?? true, capeUrl)
     } catch (err) {
       reportError(new Error('Error applying skin texture:', { cause: err }))
     }