From eb7d71017c3085dd92e3cc55edf86c9eb40fe5a9 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Mon, 29 Nov 2021 10:40:27 -0500
Subject: [PATCH] Remove some unnecessary skin checks

---
 .../geyser/skin/FakeHeadProvider.java         |  8 +---
 .../org/geysermc/geyser/skin/SkinManager.java | 42 +++++++++----------
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/skin/FakeHeadProvider.java b/core/src/main/java/org/geysermc/geyser/skin/FakeHeadProvider.java
index e54b25b2a..90f19eb24 100644
--- a/core/src/main/java/org/geysermc/geyser/skin/FakeHeadProvider.java
+++ b/core/src/main/java/org/geysermc/geyser/skin/FakeHeadProvider.java
@@ -112,9 +112,7 @@ public class FakeHeadProvider {
             try {
                 SkinProvider.SkinData mergedSkinData = MERGED_SKINS_LOADING_CACHE.get(new FakeHeadEntry(texturesProperty, fakeHeadSkinUrl, entity));
 
-                if (session.getUpstream().isInitialized()) {
-                    sendSkinPacket(session, entity, mergedSkinData);
-                }
+                sendSkinPacket(session, entity, mergedSkinData);
             } catch (ExecutionException e) {
                 GeyserImpl.getInstance().getLogger().error("Couldn't merge skin of " + entity.getUsername() + " with head skin url " + fakeHeadSkinUrl, e);
             }
@@ -136,9 +134,7 @@ public class FakeHeadProvider {
                 return;
             }
 
-            if (session.getUpstream().isInitialized()) {
-                sendSkinPacket(session, entity, skinData);
-            }
+            sendSkinPacket(session, entity, skinData);
         });
     }
 
diff --git a/core/src/main/java/org/geysermc/geyser/skin/SkinManager.java b/core/src/main/java/org/geysermc/geyser/skin/SkinManager.java
index 199d69238..02b4123e5 100644
--- a/core/src/main/java/org/geysermc/geyser/skin/SkinManager.java
+++ b/core/src/main/java/org/geysermc/geyser/skin/SkinManager.java
@@ -133,31 +133,29 @@ public class SkinManager {
                 SkinProvider.Cape cape = skinData.cape();
                 SkinProvider.SkinGeometry geometry = skinData.geometry();
 
-                if (session.getUpstream().isInitialized()) {
-                    PlayerListPacket.Entry updatedEntry = buildEntryManually(
-                            session,
-                            entity.getUuid(),
-                            entity.getUsername(),
-                            entity.getGeyserId(),
-                            skin.getTextureUrl(),
-                            skin.getSkinData(),
-                            cape.getCapeId(),
-                            cape.getCapeData(),
-                            geometry
-                    );
+                PlayerListPacket.Entry updatedEntry = buildEntryManually(
+                        session,
+                        entity.getUuid(),
+                        entity.getUsername(),
+                        entity.getGeyserId(),
+                        skin.getTextureUrl(),
+                        skin.getSkinData(),
+                        cape.getCapeId(),
+                        cape.getCapeData(),
+                        geometry
+                );
 
 
-                    PlayerListPacket playerAddPacket = new PlayerListPacket();
-                    playerAddPacket.setAction(PlayerListPacket.Action.ADD);
-                    playerAddPacket.getEntries().add(updatedEntry);
-                    session.sendUpstreamPacket(playerAddPacket);
+                PlayerListPacket playerAddPacket = new PlayerListPacket();
+                playerAddPacket.setAction(PlayerListPacket.Action.ADD);
+                playerAddPacket.getEntries().add(updatedEntry);
+                session.sendUpstreamPacket(playerAddPacket);
 
-                    if (!entity.isPlayerList()) {
-                        PlayerListPacket playerRemovePacket = new PlayerListPacket();
-                        playerRemovePacket.setAction(PlayerListPacket.Action.REMOVE);
-                        playerRemovePacket.getEntries().add(updatedEntry);
-                        session.sendUpstreamPacket(playerRemovePacket);
-                    }
+                if (!entity.isPlayerList()) {
+                    PlayerListPacket playerRemovePacket = new PlayerListPacket();
+                    playerRemovePacket.setAction(PlayerListPacket.Action.REMOVE);
+                    playerRemovePacket.getEntries().add(updatedEntry);
+                    session.sendUpstreamPacket(playerRemovePacket);
                 }
             }