apply misunderstood fix from #240

xGinko · Dec 31, 2024 · b985498 · b985498
1 parent eb1c45f
commit b985498
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/...yExploitFixesFolia/src/main/java/me/xginko/aef/modules/lagpreventions/NoShulkerDrops.java b/...yExploitFixesFolia/src/main/java/me/xginko/aef/modules/lagpreventions/NoShulkerDrops.java
@@ -31,12 +31,15 @@ public void disable() {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     private void onEntityDamage(EntityDamageEvent event) {
         if (event.getEntityType() != XEntityType.ITEM.get()) return;
-        Item item = (Item) event.getEntity();
-        if (!MaterialTags.SHULKER_BOXES.isTagged(item.getItemStack())) return;
 
-        if (event.getFinalDamage() >= item.getHealth()) {
-            event.setCancelled(true); // Cancel damage so the drop logic doesn't happen
-            item.remove(); // remove entity
+        if (event.getCause() == EntityDamageEvent.DamageCause.BLOCK_EXPLOSION || event.getCause() == EntityDamageEvent.DamageCause.ENTITY_EXPLOSION) {
+            Item item = (Item) event.getEntity();
+            if (!MaterialTags.SHULKER_BOXES.isTagged(item.getItemStack())) return;
+
+            if (event.getFinalDamage() >= item.getHealth()) {
+                event.setCancelled(true); // Cancel damage so the drop logic doesn't happen
+                item.remove(); // remove entity
+            }
         }
     }
 }
diff --git a/...ExploitFixesLegacy/src/main/java/me/xginko/aef/modules/lagpreventions/NoShulkerDrops.java b/...ExploitFixesLegacy/src/main/java/me/xginko/aef/modules/lagpreventions/NoShulkerDrops.java
@@ -31,10 +31,13 @@ public void disable() {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     private void onEntityDamage(EntityDamageEvent event) {
         if (event.getEntityType() != XEntityType.ITEM.get()) return;
-        Item item = (Item) event.getEntity();
-        if (MaterialUtil.SHULKER_BOXES.contains(item.getItemStack().getType())) {
-            event.setCancelled(true); // Cancel damage so the drop logic doesn't happen
-            item.remove(); // remove entity
+
+        if (event.getCause() == EntityDamageEvent.DamageCause.BLOCK_EXPLOSION || event.getCause() == EntityDamageEvent.DamageCause.ENTITY_EXPLOSION) {
+            Item item = (Item) event.getEntity();
+            if (MaterialUtil.SHULKER_BOXES.contains(item.getItemStack().getType())) {
+                event.setCancelled(true); // Cancel damage so the drop logic doesn't happen
+                item.remove(); // remove entity
+            }
         }
     }
 }