From 9f77b489741e5d4da4aa72657767575755228673 Mon Sep 17 00:00:00 2001
From: ceze88 <dev.ceze@gmail.com>
Date: Fri, 17 Feb 2023 16:33:28 +0100
Subject: [PATCH] Minor fix for loots

---
 .../songoda/ultimatestacker/stackable/entity/EntityStack.java | 2 +-
 .../ultimatestacker/stackable/entity/EntityStackManager.java  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/songoda/ultimatestacker/stackable/entity/EntityStack.java b/src/main/java/com/songoda/ultimatestacker/stackable/entity/EntityStack.java
index fd72ef5..731c574 100644
--- a/src/main/java/com/songoda/ultimatestacker/stackable/entity/EntityStack.java
+++ b/src/main/java/com/songoda/ultimatestacker/stackable/entity/EntityStack.java
@@ -133,8 +133,8 @@ public class EntityStack extends StackedEntity {
                     return;
                 }
             }
-            handleSingleStackDeath(killed, drops, droppedExp, event);
         }
+        handleSingleStackDeath(killed, drops, droppedExp, event);
     }
 
     public synchronized LivingEntity takeOneAndSpawnEntity(Location location) {
diff --git a/src/main/java/com/songoda/ultimatestacker/stackable/entity/EntityStackManager.java b/src/main/java/com/songoda/ultimatestacker/stackable/entity/EntityStackManager.java
index 7777dcb..3b1b508 100644
--- a/src/main/java/com/songoda/ultimatestacker/stackable/entity/EntityStackManager.java
+++ b/src/main/java/com/songoda/ultimatestacker/stackable/entity/EntityStackManager.java
@@ -109,6 +109,10 @@ public class EntityStackManager {
         if (stack == null) return null;
         int amount = stack.getAmount()-1;
         stack.destroy();
+        if (amount == 0 && newEntity != null) {
+            newEntity.remove();
+            return null;
+        }
         return createStack(newEntity, amount);
     }