From 38b52887bd1c7e299f10e36c3235db044f513110 Mon Sep 17 00:00:00 2001
From: Brianna <bri@songoda.com>
Date: Thu, 8 Aug 2019 08:36:48 -0400
Subject: [PATCH] Added Async and improved chunk stack capping.

---
 .../ultimatestacker/tasks/StackingTask.java   | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/songoda/ultimatestacker/tasks/StackingTask.java b/src/main/java/com/songoda/ultimatestacker/tasks/StackingTask.java
index ed43055..a1eb26d 100644
--- a/src/main/java/com/songoda/ultimatestacker/tasks/StackingTask.java
+++ b/src/main/java/com/songoda/ultimatestacker/tasks/StackingTask.java
@@ -38,7 +38,7 @@ public class StackingTask extends BukkitRunnable {
         this.stackManager = plugin.getEntityStackManager();
 
         // Start stacking task.
-        runTaskTimer(plugin, 0, Setting.STACK_SEARCH_TICK_SPEED.getInt());
+        runTaskTimerAsynchronously(plugin, 0, Setting.STACK_SEARCH_TICK_SPEED.getInt());
     }
 
     @Override
@@ -119,15 +119,6 @@ public class StackingTask extends BukkitRunnable {
         // Is this entity stacked?
         boolean isStack = stack != null;
 
-        if (isStack && maxPerTypeStacksPerChunk != -1) {
-            if (plugin.getEntityUtils().getSimilarStacksInChunk(livingEntity) > maxPerTypeStacksPerChunk) {
-                stack.setAmount(1);
-                livingEntity.remove();
-                this.processed.add(livingEntity.getUniqueId());
-                return;
-            }
-        }
-
         // The amount that is stackable.
         int amountToStack = isStack ? stack.getAmount() : 1;
 
@@ -218,6 +209,14 @@ public class StackingTask extends BukkitRunnable {
         // Remove all stacked entities from our stackable friends.
         stackableFriends.removeIf(stackManager::isStacked);
 
+        // If the stack cap is met then delete this entity.
+        if (maxPerTypeStacksPerChunk != -1
+                && (plugin.getEntityUtils().getSimilarStacksInChunk(livingEntity) + 1) > maxPerTypeStacksPerChunk) {
+            livingEntity.remove();
+            this.processed.add(livingEntity.getUniqueId());
+            return;
+        }
+
         // If there are none or not enough stackable friends left to create a new entity,
         // the stack sizes overlap then skip this entity.
         if (stackableFriends.isEmpty()