Check if stack threshold is disabled.

ploppyperson · Aug 27, 2021 · 066eaed · 066eaed
1 parent 30b9c6b
commit 066eaed
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/uk/antiperson/stackmob/tasks/MergeTask.java b/src/main/java/uk/antiperson/stackmob/tasks/MergeTask.java
@@ -40,6 +40,7 @@ public void run() {
                 }
                 original.setLastLocation(original.getEntity().getLocation());
             }
+            boolean stackThresholdEnabled = sm.getMainConfig().getStackThresholdEnabled(original.getEntity().getType());
             Integer[] searchRadius = sm.getMainConfig().getStackRadius(original.getEntity().getType());
             Set<StackEntity> matches = new HashSet<>();
             for (Entity nearby : original.getEntity().getNearbyEntities(searchRadius[0], searchRadius[1], searchRadius[2])) {
@@ -56,7 +57,7 @@ public void run() {
                 if (!original.match(nearbyStack)) {
                     continue;
                 }
-                if (nearbyStack.getSize() > 1 || original.getSize() > 1) {
+                if (!stackThresholdEnabled || (nearbyStack.getSize() > 1 || original.getSize() > 1)) {
                     final StackEntity removed = nearbyStack.merge(original, false);
                     if (removed != null) {
                         toRemove.add(removed);
@@ -69,7 +70,7 @@ public void run() {
                 }
                 matches.add(nearbyStack);
             }
-            if (!sm.getMainConfig().getStackThresholdEnabled(original.getEntity().getType())) {
+            if (!stackThresholdEnabled) {
                 continue;
             }
             int threshold = sm.getMainConfig().getStackThreshold(original.getEntity().getType()) - 1;