From 63033243c43cc14259f7c936e91cf8104303fbaa Mon Sep 17 00:00:00 2001
From: Brianna O'Keefe <bri@songoda.com>
Date: Tue, 12 Mar 2024 15:07:38 -0500
Subject: [PATCH] Async wait makes sense.

---
 .../tasks/StackingTask.java                   | 41 +++++++++++++------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/tasks/StackingTask.java b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/tasks/StackingTask.java
index 242a69c..053776c 100644
--- a/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/tasks/StackingTask.java
+++ b/UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/tasks/StackingTask.java
@@ -20,6 +20,9 @@ import org.bukkit.persistence.PersistentDataType;
 import org.bukkit.scheduler.BukkitRunnable;
 
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 
 import static com.craftaro.ultimatestacker.stackable.entity.Check.getChecks;
@@ -64,7 +67,7 @@ public class StackingTask extends BukkitRunnable {
         }
 
         int tickRate = Settings.STACK_SEARCH_TICK_SPEED.getInt();
-        runTaskTimer(plugin, tickRate, tickRate);
+        runTaskTimerAsynchronously(plugin, tickRate, tickRate);
     }
 
     @Override
@@ -75,7 +78,13 @@ public class StackingTask extends BukkitRunnable {
             for (SWorld sWorld : loadedWorlds) {
                 List<LivingEntity> entities;
                 // Get the loaded entities from the current world and reverse them.
-                entities = sWorld.getLivingEntities();
+                try {
+                    entities = getLivingEntitiesSync(sWorld).get();
+                } catch (ExecutionException | InterruptedException ex) {
+                    ex.printStackTrace();
+                    continue;
+                }
+
 
                 //Filter non-stackable entities to improve performance on main thread
                 entities.removeIf(this::isEntityNotStackable);
@@ -87,18 +96,20 @@ public class StackingTask extends BukkitRunnable {
                         entities.removeIf(entity1 -> entity1.getUniqueId().equals(entity.getUniqueId()));
                 }
 
-                // Loop through the entities.
-                for (LivingEntity entity : entities) {
-                    // Make sure our entity has not already been processed.
-                    // Skip it if it has been.
-                    if (processed.contains(entity.getUniqueId())) continue;
+                Bukkit.getScheduler().runTask(plugin, () -> {
+                    // Loop through the entities.
+                    for (LivingEntity entity : entities) {
+                        // Make sure our entity has not already been processed.
+                        // Skip it if it has been.
+                        if (processed.contains(entity.getUniqueId())) continue;
 
-                    // Get entity location to pass around as its faster this way.
-                    Location location = entity.getLocation();
+                        // Get entity location to pass around as its faster this way.
+                        Location location = entity.getLocation();
 
-                    // Process the entity.
-                    processEntity(entity, location, entities);
-                }
+                        // Process the entity.
+                        processEntity(entity, location, entities);
+                    }
+                });
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -109,6 +120,12 @@ public class StackingTask extends BukkitRunnable {
         }
     }
 
+    private Future<List<LivingEntity>> getLivingEntitiesSync(SWorld sWorld) {
+        CompletableFuture<List<LivingEntity>> future = new CompletableFuture<>();
+        Bukkit.getScheduler().scheduleSyncDelayedTask(this.plugin, () -> future.complete(sWorld.getLivingEntities()));
+        return future;
+    }
+
     public boolean isWorldDisabled(World world) {
         return disabledWorlds.stream().anyMatch(worldStr -> world.getName().equalsIgnoreCase(worldStr));
     }