Fixed entities spawn from spawners bypass minimum-required checks whe…

…n having Paper and spawners disabled (#670)
BG-Software-LLC · Nov 20, 2022 · ce597da · ce597da
1 parent 09f5b49
commit ce597da
Showing 1 changed file with 44 additions and 9 deletions.
diff --git a/src/main/java/com/bgsoftware/wildstacker/listeners/SpawnersListener.java b/src/main/java/com/bgsoftware/wildstacker/listeners/SpawnersListener.java
@@ -59,6 +59,7 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -67,6 +68,8 @@
 import java.util.UUID;
 import java.util.WeakHashMap;
 import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 @SuppressWarnings("unused")
 public final class SpawnersListener implements Listener {
@@ -803,18 +806,29 @@ public void onPreSpawnSpawner(PreSpawnerSpawnEvent e) {
                 }
             }
 
-            if (!targetEntityOptional.isPresent()) {
-                int mergeRadius = plugin.getSettings().entitiesMergeRadius.getOrDefault(e.getType(), SpawnCause.valueOf(e.getReason()), 0);
+            int mergeRadius = plugin.getSettings().entitiesMergeRadius.getOrDefault(e.getType(), SpawnCause.valueOf(e.getReason()), 0);
+            AtomicInteger nearbyEntitiesCount = new AtomicInteger(0);
+
+            List<StackedEntity> nearbyStackableEntities = mergeRadius <= 0 ? Collections.emptyList() :
+                    EntitiesGetter.getNearbyEntities(e.getSpawnLocation(), mergeRadius,
+                                    entity -> entity.getType() == e.getType() && EntityUtils.isStackable(entity))
+                            .map(WStackedEntity::of)
+                            .filter(stackedEntity -> {
+                                if (stackedEntity.getUpgrade().equals(stackedSpawner.getUpgrade()) &&
+                                        stackedEntity.canGetStacked(spawnMobsCount) == StackCheckResult.SUCCESS) {
+                                    nearbyEntitiesCount.set(nearbyEntitiesCount.get() + stackedEntity.getStackAmount());
+                                    return true;
+                                }
 
+                                return false;
+                            }).collect(Collectors.toList());
+
+            if (!targetEntityOptional.isPresent()) {
                 if (mergeRadius <= 0)
                     return;
 
-                targetEntityOptional = EntitiesGetter.getNearbyEntities(e.getSpawnLocation(),
-                                mergeRadius, entity -> entity.getType() == e.getType() && EntityUtils.isStackable(entity))
-                        .map(WStackedEntity::of)
-                        .filter(stackedEntity -> stackedEntity.getUpgrade().equals(stackedSpawner.getUpgrade()) &&
-                                stackedEntity.canGetStacked(spawnMobsCount) == StackCheckResult.SUCCESS)
-                        .findFirst();
+                if (!nearbyStackableEntities.isEmpty())
+                    targetEntityOptional = Optional.of(nearbyStackableEntities.get(0));
             }
 
             if (!targetEntityOptional.isPresent()) {
@@ -823,7 +837,28 @@ public void onPreSpawnSpawner(PreSpawnerSpawnEvent e) {
             }
 
             StackedEntity stackedEntity = targetEntityOptional.get();
-            stackedEntity.increaseStackAmount(spawnMobsCount, true);
+
+            int finalSpawnMobsCount;
+
+            int minimumEntityRequirement = GeneralUtils.get(plugin.getSettings().minimumRequiredEntities, stackedEntity, 0);
+            if (nearbyEntitiesCount.get() + spawnMobsCount >= minimumEntityRequirement) {
+                nearbyStackableEntities.forEach(nearbyEntity -> {
+                    if (nearbyEntity != stackedEntity) {
+                        nearbyEntity.remove();
+                        nearbyEntity.spawnStackParticle(true);
+                    }
+                });
+
+                stackedEntity.increaseStackAmount(spawnMobsCount, true);
+                finalSpawnMobsCount = nearbyEntitiesCount.get() + spawnMobsCount - stackedEntity.getStackAmount();
+            } else if (minimumEntityRequirement <= 0) {
+                finalSpawnMobsCount = spawnMobsCount;
+            } else {
+                return;
+            }
+
+            stackedEntity.increaseStackAmount(finalSpawnMobsCount, true);
+
             stackedEntity.spawnStackParticle(true);
 
             e.setCancelled(true);