send only if not accepted

Minehut · Dec 7, 2022 · a98c73c · a98c73c
1 parent eab1b79
commit a98c73c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/main/java/com/minehut/cosmetics/cosmetics/listeners/ResourcePackListener.java b/src/main/java/com/minehut/cosmetics/cosmetics/listeners/ResourcePackListener.java
@@ -34,8 +34,10 @@ public void onJoin(PlayerJoinEvent event) {
 
         final Player player = event.getPlayer();
 
-        Bukkit.getScheduler().runTaskLater(Cosmetics.get(), () -> {
-            player.setResourcePack(info.getUrl(), info.getSha1(), false, PACK_COPY);
-        }, 1);
+        Bukkit.getScheduler().runTaskAsynchronously(Cosmetics.get(), () -> {
+            final boolean accepted = Cosmetics.get().resourcePackManager().fetchPackStatus(player, false).join();
+            if (accepted) return;
+            Bukkit.getScheduler().runTask(Cosmetics.get(), () -> player.setResourcePack(info.getUrl(), info.getSha1(), false, PACK_COPY));
+        });
     }
 }
diff --git a/src/main/java/com/minehut/cosmetics/pack/ResourcePackManager.java b/src/main/java/com/minehut/cosmetics/pack/ResourcePackManager.java
@@ -27,7 +27,7 @@ public class ResourcePackManager implements Listener {
     public void onJoin(PlayerJoinEvent event) {
         // check if the player has the pack
         Bukkit.getScheduler().runTaskAsynchronously(Cosmetics.get(), () -> {
-            final boolean accepted = fetchPackStatus(event.getPlayer()).join();
+            final boolean accepted = fetchPackStatus(event.getPlayer(), true).join();
 
             // catch the case where they accepted the pack before the request completes
             if (hasAccepted(event.getPlayer().getUniqueId())) return;
@@ -59,9 +59,8 @@ public void onQuit(PlayerQuitEvent event) {
         accepted.remove(event.getPlayer().getUniqueId());
     }
 
-    private CompletableFuture<Boolean> fetchPackStatus(Player player) {
-        final boolean localStatus = player.hasResourcePack();
-        if (localStatus) {
+    public CompletableFuture<Boolean> fetchPackStatus(Player player, boolean useLocal) {
+        if (useLocal && player.hasResourcePack()) {
             return CompletableFuture.completedFuture(true);
         }