From 4aa66cb051bbe75cfbd2b175d2d7080464e3496b Mon Sep 17 00:00:00 2001 From: cryptite Date: Sat, 3 May 2025 08:16:36 -0500 Subject: [PATCH] Fix pack exemption on velocity --- .../velocity/listener/ResourcePackListener.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/velocity/src/main/java/com/convallyria/forcepack/velocity/listener/ResourcePackListener.java b/velocity/src/main/java/com/convallyria/forcepack/velocity/listener/ResourcePackListener.java index 3064a18..724acc4 100644 --- a/velocity/src/main/java/com/convallyria/forcepack/velocity/listener/ResourcePackListener.java +++ b/velocity/src/main/java/com/convallyria/forcepack/velocity/listener/ResourcePackListener.java @@ -74,11 +74,6 @@ public void onPackStatus(PlayerResourcePackStatusEvent event) { return; } - if (plugin.temporaryExemptedPlayers.remove(player.getUniqueId())) { - plugin.log("Ignoring player " + player.getUsername() + " as they have a one-off exemption."); - return; - } - final VelocityConfig root; if (packByServer.getServer().contains(ForcePackVelocity.GLOBAL_SERVER_NAME)) { root = plugin.getConfig().getConfig("global-pack"); @@ -175,6 +170,12 @@ public void onJoin(ServerPostConnectEvent event) { final Player player = event.getPlayer(); final Optional currentServer = player.getCurrentServer(); if (currentServer.isEmpty()) return; + + if (plugin.temporaryExemptedPlayers.remove(player.getUniqueId())) { + plugin.log("Ignoring player " + player.getUsername() + " as they have a one-off exemption."); + return; + } + plugin.getPackHandler().setPack(player, currentServer.get()); }