Fixed EntityDamageEvent is not called in some cases (#974)

BG-Software-LLC · Nov 22, 2024 · 1588b56 · 1588b56
1 parent 217d78e
commit 1588b56
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/src/main/java/com/bgsoftware/wildstacker/listeners/EntitiesListener.java b/src/main/java/com/bgsoftware/wildstacker/listeners/EntitiesListener.java
@@ -211,10 +211,24 @@ public void handleEntityDamage(EntityDamageEvent e) {
         handleEntityDamage(e, false);
     }
 
+    private static void recallDamageEvent(EntityDamageEvent damageEvent) {
+        BiHandlerList entityDamageHandlerList = (BiHandlerList) EntityDamageEvent.getHandlerList();
+        try {
+            entityDamageHandlerList.setMode(BiHandlerList.Mode.ORIGINAL);
+            // Call the event again.
+            Bukkit.getPluginManager().callEvent(damageEvent);
+        } finally {
+            entityDamageHandlerList.setMode(BiHandlerList.Mode.NEW);
+        }
+    }
+
     private void handleEntityDamage(EntityDamageEvent damageEvent, boolean fromDeathEvent) {
         // Making sure the entity is stackable
-        if (!plugin.getSettings().entitiesStackingEnabled || !EntityUtils.isStackable(damageEvent.getEntity()))
+        if (!plugin.getSettings().entitiesStackingEnabled || !EntityUtils.isStackable(damageEvent.getEntity())) {
+            // If not, we still want to re-call the damage event
+            recallDamageEvent(damageEvent);
             return;
+        }
 
         LivingEntity livingEntity = (LivingEntity) damageEvent.getEntity();
         StackedEntity stackedEntity = WStackedEntity.of(livingEntity);
@@ -232,14 +246,7 @@ private void handleEntityDamage(EntityDamageEvent damageEvent, boolean fromDeath
         if (!fromDeathEvent) {
             damageEvent.setCancelled(true);
             entityDamageData = new EntityDamageData(damageEvent);
-            BiHandlerList entityDamageHandlerList = (BiHandlerList) EntityDamageEvent.getHandlerList();
-            try {
-                entityDamageHandlerList.setMode(BiHandlerList.Mode.ORIGINAL);
-                // Call the event again.
-                Bukkit.getPluginManager().callEvent(damageEvent);
-            } finally {
-                entityDamageHandlerList.setMode(BiHandlerList.Mode.NEW);
-            }
+            recallDamageEvent(damageEvent);
         }
 
         if (!damageEvent.isCancelled())