From aa136420c80323ba006184ceb12bc4bb9966f60b Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Thu, 24 Dec 2020 19:00:35 +0800
Subject: [PATCH] Make initial skin packet delay configurable

---
 main/src/main/java/net/citizensnpcs/EventListen.java   | 3 ++-
 main/src/main/java/net/citizensnpcs/Settings.java      | 1 +
 main/src/main/java/net/citizensnpcs/npc/skin/Skin.java | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/main/src/main/java/net/citizensnpcs/EventListen.java b/main/src/main/java/net/citizensnpcs/EventListen.java
index 5bdbf4d25..d0577bfd3 100644
--- a/main/src/main/java/net/citizensnpcs/EventListen.java
+++ b/main/src/main/java/net/citizensnpcs/EventListen.java
@@ -502,7 +502,8 @@ public class EventListen implements Listener {
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerJoin(PlayerJoinEvent event) {
-        skinUpdateTracker.updatePlayer(event.getPlayer(), 6 * 20, true);
+        skinUpdateTracker.updatePlayer(event.getPlayer(), Setting.INITIAL_PLAYER_JOIN_SKIN_PACKET_DELAY_TICKS.asInt(),
+                true);
 
         if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
             Util.updateNPCTeams(event.getPlayer(), 0);
diff --git a/main/src/main/java/net/citizensnpcs/Settings.java b/main/src/main/java/net/citizensnpcs/Settings.java
index 08d00e683..bbb2f7f2d 100644
--- a/main/src/main/java/net/citizensnpcs/Settings.java
+++ b/main/src/main/java/net/citizensnpcs/Settings.java
@@ -107,6 +107,7 @@ public class Settings {
         ERROR_COLOUR("general.color-scheme.message-error", "<c>"),
         FOLLOW_ACROSS_WORLDS("npc.follow.teleport-across-worlds", true),
         HIGHLIGHT_COLOUR("general.color-scheme.message-highlight", "<e>"),
+        INITIAL_PLAYER_JOIN_SKIN_PACKET_DELAY_TICKS("npc.skins.player-join-update-delay-ticks", 3 * 20),
         KEEP_CHUNKS_LOADED("npc.chunks.always-keep-loaded", false),
         LOCALE("general.translation.locale", ""),
         MAX_CONTROLLABLE_GROUND_SPEED("npc.controllable.max-ground-speed", 0.5),
diff --git a/main/src/main/java/net/citizensnpcs/npc/skin/Skin.java b/main/src/main/java/net/citizensnpcs/npc/skin/Skin.java
index dceda44fb..dff0d7d9a 100644
--- a/main/src/main/java/net/citizensnpcs/npc/skin/Skin.java
+++ b/main/src/main/java/net/citizensnpcs/npc/skin/Skin.java
@@ -116,7 +116,6 @@ public class Skin {
                 return false;
             }
         }
-
         setNPCSkinData(entity, skinName, skinId, skinData);
 
         return true;