diff --git a/common/src/main/java/pw/kaboom/extras/platform/PlatformScheduler.java b/common/src/main/java/pw/kaboom/extras/platform/PlatformScheduler.java index d6545ae..d155877 100644 --- a/common/src/main/java/pw/kaboom/extras/platform/PlatformScheduler.java +++ b/common/src/main/java/pw/kaboom/extras/platform/PlatformScheduler.java @@ -45,7 +45,8 @@ public final class PlatformScheduler { currentScheduler.executeOnGlobalRegion(plugin, runnable); } - public static void executeOnEntity(final Plugin plugin, final Entity entity, final Runnable runnable) { + public static void executeOnEntity(final Plugin plugin, final Entity entity, + final Runnable runnable) { currentScheduler.executeOnEntity(plugin, entity, runnable); } } diff --git a/src/main/java/pw/kaboom/extras/commands/CommandSkin.java b/src/main/java/pw/kaboom/extras/commands/CommandSkin.java index 690bb74..4d4423e 100644 --- a/src/main/java/pw/kaboom/extras/commands/CommandSkin.java +++ b/src/main/java/pw/kaboom/extras/commands/CommandSkin.java @@ -7,8 +7,6 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.Player; -import org.bukkit.plugin.java.JavaPlugin; -import pw.kaboom.extras.Main; import pw.kaboom.extras.skin.SkinManager; import javax.annotation.Nonnull; @@ -23,14 +21,6 @@ public final class CommandSkin implements CommandExecutor { final @Nonnull Command command, final @Nonnull String label, final String[] args) { - final Main plugin = JavaPlugin.getPlugin(Main.class); - - if (plugin.isFolia()) { - sender.sendMessage(Component - .text("Command cannot be ran on Folia servers!")); - return true; - } - if (sender instanceof ConsoleCommandSender) { sender.sendMessage(Component .text("Command has to be run by a player")); diff --git a/src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java b/src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java index dd08965..7b1a618 100644 --- a/src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java +++ b/src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java @@ -110,10 +110,8 @@ public final class PlayerConnection implements Listener { } final Server server = Bukkit.getServer(); - final Main plugin = JavaPlugin.getPlugin(Main.class); - - if (!server.getOnlineMode() && !plugin.isFolia()) { + if (!server.getOnlineMode()) { SkinManager.applySkin(player, player.getName(), false); } } diff --git a/src/main/java/pw/kaboom/extras/skin/SkinManager.java b/src/main/java/pw/kaboom/extras/skin/SkinManager.java index 4beaff1..5e76006 100644 --- a/src/main/java/pw/kaboom/extras/skin/SkinManager.java +++ b/src/main/java/pw/kaboom/extras/skin/SkinManager.java @@ -29,17 +29,13 @@ public final class SkinManager { .newCachedThreadPool(); public static void resetSkin(final Player player, final boolean shouldSendMessage) { - final Main plugin = JavaPlugin.getPlugin(Main.class); - - if (plugin.isFolia()) { - return; - } - executorService.submit(() -> { final PlayerProfile playerProfile = player.getPlayerProfile(); playerProfile.removeProperty("textures"); - PlatformScheduler.runSync(plugin, () -> player.setPlayerProfile(playerProfile)); + final Main plugin = JavaPlugin.getPlugin(Main.class); + PlatformScheduler.executeOnEntity(plugin, player, + () -> player.setPlayerProfile(playerProfile)); if(!shouldSendMessage) { return; @@ -51,12 +47,6 @@ public final class SkinManager { public static void applySkin(final Player player, final String name, final boolean shouldSendMessage) { - final Main plugin = JavaPlugin.getPlugin(Main.class); - - if (plugin.isFolia()) { - return; - } - executorService.submit(() -> { final PlayerProfile profile = player.getPlayerProfile(); final SkinData skinData; @@ -76,7 +66,8 @@ public final class SkinManager { final String signature = skinData.signature(); profile.setProperty(new ProfileProperty("textures", texture, signature)); - PlatformScheduler.runSync(plugin, + final Main plugin = JavaPlugin.getPlugin(Main.class); + PlatformScheduler.executeOnEntity(plugin, player, () -> player.setPlayerProfile(profile));