From 631ec84fb72a8d299b2ba132db5bf6527a3a7996 Mon Sep 17 00:00:00 2001
From: Brianna <bri@songoda.com>
Date: Wed, 22 Jul 2020 12:48:42 -0500
Subject: [PATCH 1/3] Only triggered charged when the killer creeper is
 charged.

---
 .../songoda/ultimatestacker/lootables/LootablesManager.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/songoda/ultimatestacker/lootables/LootablesManager.java b/src/main/java/com/songoda/ultimatestacker/lootables/LootablesManager.java
index 28bffea..a0dc6f2 100644
--- a/src/main/java/com/songoda/ultimatestacker/lootables/LootablesManager.java
+++ b/src/main/java/com/songoda/ultimatestacker/lootables/LootablesManager.java
@@ -63,9 +63,9 @@ public class LootablesManager {
             };
         }
         EntityType killer = null;
+        Entity killerEntity = null;
         if (entity.getLastDamageCause() instanceof EntityDamageByEntityEvent) {
-            Entity killerEntity = ((EntityDamageByEntityEvent) entity.getLastDamageCause()).getDamager();
-            killer = killerEntity.getType();
+            killerEntity = ((EntityDamageByEntityEvent) entity.getLastDamageCause()).getDamager();
             if (killerEntity instanceof Projectile) {
                 Projectile projectile = (Projectile) killerEntity;
                 if (projectile.getShooter() instanceof Entity) {
@@ -75,7 +75,7 @@ public class LootablesManager {
         }
         return lootManager.runLoot(modify,
                 entity.getFireTicks() > 0,
-                entity instanceof Creeper && ((Creeper) entity).isPowered(),
+                killerEntity instanceof Creeper && ((Creeper) killerEntity).isPowered(),
                 entity.getKiller() != null ? entity.getKiller().getItemInHand() : null,
                 killer,
                 loot,

From ae1c0a907892c47f871a190c02f448c2bc26a086 Mon Sep 17 00:00:00 2001
From: Brianna <bri@songoda.com>
Date: Wed, 5 Aug 2020 16:05:57 -0500
Subject: [PATCH 2/3] Apply spawner data on spawn.

---
 .../listeners/SpawnerListeners.java               |  2 ++
 .../ultimatestacker/spawner/SpawnerStack.java     | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/songoda/ultimatestacker/listeners/SpawnerListeners.java b/src/main/java/com/songoda/ultimatestacker/listeners/SpawnerListeners.java
index b65c782..fa43741 100644
--- a/src/main/java/com/songoda/ultimatestacker/listeners/SpawnerListeners.java
+++ b/src/main/java/com/songoda/ultimatestacker/listeners/SpawnerListeners.java
@@ -42,6 +42,8 @@ public class SpawnerListeners implements Listener {
 
         SpawnerStack spawnerStack = spawnerStackManager.getSpawner(event.getSpawner().getLocation());
 
+        spawnerStack.initialize();
+
         EntityStack stack = plugin.getEntityStackManager().addStack(event.getEntity().getUniqueId(), spawnerStack.calculateSpawnCount());
 
         plugin.getStackingTask().attemptSplit(stack, (LivingEntity) event.getEntity());
diff --git a/src/main/java/com/songoda/ultimatestacker/spawner/SpawnerStack.java b/src/main/java/com/songoda/ultimatestacker/spawner/SpawnerStack.java
index 32f90ce..5e33987 100644
--- a/src/main/java/com/songoda/ultimatestacker/spawner/SpawnerStack.java
+++ b/src/main/java/com/songoda/ultimatestacker/spawner/SpawnerStack.java
@@ -14,13 +14,14 @@ import java.util.Random;
 public class SpawnerStack {
 
     private int id;
+    private boolean initialized = false;
 
     private final Location location;
-    private int amount = 1;
+    private int amount;
 
     public SpawnerStack(Location location, int amount) {
         this.location = location;
-        setAmount(amount);
+        this.amount = amount;
     }
 
     public int getAmount() {
@@ -31,7 +32,10 @@ public class SpawnerStack {
         UltimateStacker plugin = UltimateStacker.getInstance();
         this.amount = amount;
         plugin.getDataManager().updateSpawner(this);
+    }
 
+    public void updateAmount() {
+        UltimateStacker plugin = UltimateStacker.getInstance();
         Bukkit.getScheduler().runTaskLater(plugin, () -> {
             if (!(location.getBlock().getState() instanceof CreatureSpawner)) return;
             int count = Settings.STACK_ENTITIES.getBoolean()
@@ -85,6 +89,13 @@ public class SpawnerStack {
         return location.getWorld();
     }
 
+    public void initialize() {
+        if (!initialized) {
+            updateAmount();
+            this.initialized = true;
+        }
+    }
+
     @Override
     public String toString() {
         return "SpawnerStack:{"

From 74ba4bcd11310a645ce158bb09c3bedd8c82deb5 Mon Sep 17 00:00:00 2001
From: Brianna <bri@songoda.com>
Date: Wed, 22 Jul 2020 12:48:56 -0500
Subject: [PATCH 3/3] version 1.11.20

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 24cbbfa..38ff94e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <groupId>com.songoda</groupId>
     <artifactId>UltimateStacker</artifactId>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.11.19</version>
+    <version>1.11.20</version>
     <build>
         <defaultGoal>clean install</defaultGoal>
         <finalName>UltimateStacker-${project.version}</finalName>