From 902b2e051a8bd2bce17c8c13f235c8ad17aaa2b9 Mon Sep 17 00:00:00 2001
From: bundabrg <brendan@grieve.com.au>
Date: Tue, 21 Jul 2020 10:42:32 +0800
Subject: [PATCH] Resolve PR queries

---
 .../platform/sponge/GeyserSpongeConfiguration.java   |  2 +-
 .../org/geysermc/connector/entity/PlayerEntity.java  |  2 --
 .../org/geysermc/connector/utils/SkinProvider.java   | 10 +++++-----
 .../java/org/geysermc/connector/utils/SkinUtils.java | 12 ------------
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongeConfiguration.java b/bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongeConfiguration.java
index ec3dd6f219a..4709d4e7323 100644
--- a/bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongeConfiguration.java
+++ b/bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongeConfiguration.java
@@ -151,7 +151,7 @@ public boolean isCacheChunks() {
 
     @Override
     public int getCacheImages() {
-        return node.getNode("cache-skins").getInt(0);
+        return node.getNode("cache-skins").getInt(180);
     }
 
     @Override
diff --git a/connector/src/main/java/org/geysermc/connector/entity/PlayerEntity.java b/connector/src/main/java/org/geysermc/connector/entity/PlayerEntity.java
index f417f0620c7..424f51870e8 100644
--- a/connector/src/main/java/org/geysermc/connector/entity/PlayerEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/PlayerEntity.java
@@ -38,7 +38,6 @@
 import com.nukkitx.protocol.bedrock.packet.*;
 import lombok.Getter;
 import lombok.Setter;
-import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.entity.attribute.Attribute;
 import org.geysermc.connector.entity.attribute.AttributeType;
 import org.geysermc.connector.entity.type.EntityType;
@@ -47,7 +46,6 @@
 import org.geysermc.connector.scoreboard.Team;
 import org.geysermc.connector.utils.AttributeUtils;
 import org.geysermc.connector.utils.MessageUtils;
-import org.geysermc.connector.network.session.cache.EntityEffectCache;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/connector/src/main/java/org/geysermc/connector/utils/SkinProvider.java b/connector/src/main/java/org/geysermc/connector/utils/SkinProvider.java
index 2a74e0a2984..8d26065a13c 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/SkinProvider.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/SkinProvider.java
@@ -55,15 +55,15 @@ public class SkinProvider {
     public static final Skin EMPTY_SKIN = new Skin(-1, "steve", STEVE_SKIN);
     public static final byte[] ALEX_SKIN = new ProvidedSkin("bedrock/skin/skin_alex.png").getSkin();
     public static final Skin EMPTY_SKIN_ALEX = new Skin(-1, "alex", ALEX_SKIN);
-    private static Map<String, Skin> cachedSkins = new ConcurrentHashMap<>();
-    private static Map<String, CompletableFuture<Skin>> requestedSkins = new ConcurrentHashMap<>();
+    private static final Map<String, Skin> cachedSkins = new ConcurrentHashMap<>();
+    private static final Map<String, CompletableFuture<Skin>> requestedSkins = new ConcurrentHashMap<>();
 
     public static final Cape EMPTY_CAPE = new Cape("", "no-cape", new byte[0], -1, true);
-    private static Map<String, Cape> cachedCapes = new ConcurrentHashMap<>();
-    private static Map<String, CompletableFuture<Cape>> requestedCapes = new ConcurrentHashMap<>();
+    private static final Map<String, Cape> cachedCapes = new ConcurrentHashMap<>();
+    private static final Map<String, CompletableFuture<Cape>> requestedCapes = new ConcurrentHashMap<>();
 
     public static final SkinGeometry EMPTY_GEOMETRY = SkinProvider.SkinGeometry.getLegacy(false);
-    private static Map<UUID, SkinGeometry> cachedGeometry = new ConcurrentHashMap<>();
+    private static final Map<UUID, SkinGeometry> cachedGeometry = new ConcurrentHashMap<>();
 
     public static final boolean ALLOW_THIRD_PARTY_EARS = GeyserConnector.getInstance().getConfig().isAllowThirdPartyEars();
     public static String EARS_GEOMETRY;
diff --git a/connector/src/main/java/org/geysermc/connector/utils/SkinUtils.java b/connector/src/main/java/org/geysermc/connector/utils/SkinUtils.java
index 902b58a79ec..77ab7f9393c 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/SkinUtils.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/SkinUtils.java
@@ -31,8 +31,6 @@
 import com.nukkitx.protocol.bedrock.data.skin.ImageData;
 import com.nukkitx.protocol.bedrock.data.skin.SerializedSkin;
 import com.nukkitx.protocol.bedrock.packet.PlayerListPacket;
-
-import com.nukkitx.protocol.bedrock.packet.PlayerSkinPacket;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.geysermc.connector.common.AuthType;
@@ -238,16 +236,6 @@ public static void requestAndHandleSkinAndCape(PlayerEntity entity, GeyserSessio
                                 playerAddPacket.getEntries().add(updatedEntry);
                                 session.sendUpstreamPacket(playerAddPacket);
 
-//                                // Update SKin
-//                                PlayerSkinPacket playerSkinPacket = new PlayerSkinPacket();
-//                                playerSkinPacket.setUuid(updatedEntry.getUuid());
-//                                playerSkinPacket.setSkin(updatedEntry.getSkin());
-//                                playerSkinPacket.setOldSkinName("OldName");
-//                                playerSkinPacket.setNewSkinName("NewName");
-//                                playerSkinPacket.setTrustedSkin(true);
-//                                session.getUpstream().sendPacket(playerSkinPacket);
-//                                session.getConnector().getLogger().debug("Sending skin for " + entity.getUsername());
-
                                 if (!entity.isPlayerList()) {
                                     PlayerListPacket playerRemovePacket = new PlayerListPacket();
                                     playerRemovePacket.setAction(PlayerListPacket.Action.REMOVE);