From 5bab1a1ac749f6f587a9f6f7b33d8b4ba53588ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elias=20M=C3=BCller?= <elias@elias-mueller.com>
Date: Sun, 2 Mar 2025 23:35:30 +0100
Subject: [PATCH] fixed skin not being applied properly, made /skin privileged

---
 .../java/eu/mhsl/minenet/minigames/command/Commands.java | 2 +-
 .../command/{anonymous => privileged}/SkinCommand.java   | 6 +++---
 .../java/eu/mhsl/minenet/minigames/skin/SkinCache.java   | 9 ++-------
 3 files changed, 6 insertions(+), 11 deletions(-)
 rename src/main/java/eu/mhsl/minenet/minigames/command/{anonymous => privileged}/SkinCommand.java (73%)

diff --git a/src/main/java/eu/mhsl/minenet/minigames/command/Commands.java b/src/main/java/eu/mhsl/minenet/minigames/command/Commands.java
index a15aba4..93ea88b 100644
--- a/src/main/java/eu/mhsl/minenet/minigames/command/Commands.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/command/Commands.java
@@ -1,6 +1,6 @@
 package eu.mhsl.minenet.minigames.command;
 
-import eu.mhsl.minenet.minigames.command.anonymous.SkinCommand;
+import eu.mhsl.minenet.minigames.command.privileged.SkinCommand;
 import eu.mhsl.minenet.minigames.command.privileged.*;
 import eu.mhsl.minenet.minigames.command.anonymous.HubCommand;
 import eu.mhsl.minenet.minigames.command.anonymous.LeaveCommand;
diff --git a/src/main/java/eu/mhsl/minenet/minigames/command/anonymous/SkinCommand.java b/src/main/java/eu/mhsl/minenet/minigames/command/privileged/SkinCommand.java
similarity index 73%
rename from src/main/java/eu/mhsl/minenet/minigames/command/anonymous/SkinCommand.java
rename to src/main/java/eu/mhsl/minenet/minigames/command/privileged/SkinCommand.java
index 9f4ffe1..4de09dc 100644
--- a/src/main/java/eu/mhsl/minenet/minigames/command/anonymous/SkinCommand.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/command/privileged/SkinCommand.java
@@ -1,11 +1,11 @@
-package eu.mhsl.minenet.minigames.command.anonymous;
+package eu.mhsl.minenet.minigames.command.privileged;
 
-import net.minestom.server.command.builder.Command;
+import eu.mhsl.minenet.minigames.command.PrivilegedCommand;
 import net.minestom.server.command.builder.arguments.ArgumentType;
 import net.minestom.server.entity.Player;
 import net.minestom.server.entity.PlayerSkin;
 
-public class SkinCommand extends Command {
+public class SkinCommand extends PrivilegedCommand {
     public SkinCommand() {
         super("skin");
 
diff --git a/src/main/java/eu/mhsl/minenet/minigames/skin/SkinCache.java b/src/main/java/eu/mhsl/minenet/minigames/skin/SkinCache.java
index 681ba4a..e07e47a 100644
--- a/src/main/java/eu/mhsl/minenet/minigames/skin/SkinCache.java
+++ b/src/main/java/eu/mhsl/minenet/minigames/skin/SkinCache.java
@@ -3,7 +3,6 @@ package eu.mhsl.minenet.minigames.skin;
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.entity.Player;
 import net.minestom.server.entity.PlayerSkin;
-import net.minestom.server.timer.ExecutionType;
 import net.minestom.server.timer.TaskSchedule;
 
 import java.util.HashMap;
@@ -12,19 +11,15 @@ import java.util.Map;
 public class SkinCache {
     private static final Map<String, PlayerSkin> skins = new HashMap<>();
 
-    public static PlayerSkin getSkin(Player p) {
-        return SkinCache.getSkin(p.getUsername());
-    }
-
     public static PlayerSkin getSkin(String p) {
         if(!skins.containsKey(p)) skins.put(p, PlayerSkin.fromUsername(p));
         return skins.get(p);
     }
 
     public static void applySkin(Player p) {
-        MinecraftServer.getSchedulerManager().submitTask(() -> {
+        MinecraftServer.getSchedulerManager().scheduleTask(() -> {
             p.setSkin(SkinCache.getSkin(p.getUsername()));
             return TaskSchedule.stop();
-        }, ExecutionType.TICK_END);
+        }, TaskSchedule.seconds(3));
     }
 }