From 0d79bad5915a5efd59791425595cd183d04cef05 Mon Sep 17 00:00:00 2001
From: ceze88 <dev.ceze@gmail.com>
Date: Sat, 6 May 2023 12:34:13 +0200
Subject: [PATCH] Fix no AI setting when stacking mobs was disabled

---
 .../listeners/SpawnerListeners.java               | 15 ++++++++-------
 .../listeners/entity/EntityListeners.java         |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/songoda/ultimatestacker/listeners/SpawnerListeners.java b/src/main/java/com/songoda/ultimatestacker/listeners/SpawnerListeners.java
index 850264c..ed413c7 100644
--- a/src/main/java/com/songoda/ultimatestacker/listeners/SpawnerListeners.java
+++ b/src/main/java/com/songoda/ultimatestacker/listeners/SpawnerListeners.java
@@ -40,8 +40,7 @@ public class SpawnerListeners implements Listener {
     @EventHandler
     public void onSpawn(SpawnerSpawnEvent event) {
         if (plugin.getStackingTask() == null) return; //Don't spam error when reloading the plugin
-        if (!Settings.STACK_ENTITIES.getBoolean()
-                || !plugin.spawnersEnabled()
+        if (!plugin.spawnersEnabled()
                 || plugin.getStackingTask().isWorldDisabled(event.getLocation().getWorld())) return;
 
         SpawnerStackManager spawnerStackManager = plugin.getSpawnerStackManager();
@@ -65,23 +64,25 @@ public class SpawnerListeners implements Listener {
 
         SpawnerStack spawnerStack = spawnerStackManager.getSpawner(location);
 
-        int amountToSpawn = spawnerStack.calculateSpawnCount(entity.getType());
-        if (amountToSpawn <= 1) return;
+        int amountToSpawn = Settings.STACK_ENTITIES.getBoolean() ? spawnerStack.calculateSpawnCount(entity.getType()) : 1;
+        if (amountToSpawn <= 0) return;
         entity.remove();
 
         spawnerStack.spawn(amountToSpawn, "EXPLOSION_NORMAL", null, (e) -> {
-            if (Settings.NO_AI.getBoolean())
+            if (Settings.NO_AI.getBoolean()) {
                 EntityUtils.setUnaware(e);
+            }
 
-            if (mcmmo)
+            if (mcmmo) {
                 entity.setMetadata("mcMMO: Spawned Entity", new FixedMetadataValue(plugin, true));
+            }
 
             UltimateStacker.getInstance().getEntityStackManager().setStack(e, amountToSpawn);
             return true;
         }, event.getEntityType());
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler
     public void PlayerInteractEventEgg(PlayerInteractEvent event) {
         if (!plugin.spawnersEnabled()
                 || !event.getAction().equals(Action.RIGHT_CLICK_BLOCK))
diff --git a/src/main/java/com/songoda/ultimatestacker/listeners/entity/EntityListeners.java b/src/main/java/com/songoda/ultimatestacker/listeners/entity/EntityListeners.java
index 93a21f8..7a6284c 100644
--- a/src/main/java/com/songoda/ultimatestacker/listeners/entity/EntityListeners.java
+++ b/src/main/java/com/songoda/ultimatestacker/listeners/entity/EntityListeners.java
@@ -75,7 +75,7 @@ public class EntityListeners implements Listener {
         event.getEntity().setItemStack(item);
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler
     public void onHurt(EntityDamageByEntityEvent event) {
         if (!Settings.STACK_ENTITIES.getBoolean() || !(event.getDamager() instanceof Player)) return;
 
@@ -100,7 +100,7 @@ public class EntityListeners implements Listener {
         event.getEntity().setMetadata("US_REASON", new FixedMetadataValue(plugin, event.getSpawnReason().name()));
     }
     
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler
     public void onBlow(EntityExplodeEvent event) {
         if (!plugin.spawnersEnabled()) return;