From 0eb75dd6ddecc8f45e32938a4737bf9f16e9c2f1 Mon Sep 17 00:00:00 2001
From: YouHaveTrouble <youhavetrouble@youhavetrouble.me>
Date: Sat, 26 Oct 2024 12:05:16 +0200
Subject: [PATCH] resolve mob head type in separate method

---
 .../listeners/BeheadingListener.java          | 72 ++++++++++---------
 1 file changed, 38 insertions(+), 34 deletions(-)

diff --git a/src/main/java/me/youhavetrouble/enchantio/listeners/BeheadingListener.java b/src/main/java/me/youhavetrouble/enchantio/listeners/BeheadingListener.java
index dc4ac53..164e849 100644
--- a/src/main/java/me/youhavetrouble/enchantio/listeners/BeheadingListener.java
+++ b/src/main/java/me/youhavetrouble/enchantio/listeners/BeheadingListener.java
@@ -22,6 +22,7 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.SkullMeta;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Collection;
 import java.util.concurrent.ThreadLocalRandom;
 
 
@@ -51,46 +52,49 @@ public class BeheadingListener implements Listener {
 
         if (ThreadLocalRandom.current().nextDouble() > chance) return;
 
-        ItemStack head = null;
-
-        switch (event.getEntity().getType()) {
-            case ZOMBIE -> {
-                if (listContainsItemType(event.getDrops(), Material.ZOMBIE_HEAD)) return;
-                head = new ItemStack(org.bukkit.Material.ZOMBIE_HEAD);
-            }
-            case PIGLIN -> {
-                if (listContainsItemType(event.getDrops(), Material.PIGLIN_HEAD)) return;
-                head = new ItemStack(org.bukkit.Material.PIGLIN_HEAD);
-            }
-            case WITHER_SKELETON -> {
-                if (listContainsItemType(event.getDrops(), Material.WITHER_SKELETON_SKULL)) return;
-                head = new ItemStack(org.bukkit.Material.WITHER_SKELETON_SKULL);
-            }
-            case SKELETON -> {
-                if (listContainsItemType(event.getDrops(), Material.SKELETON_SKULL)) return;
-                head = new ItemStack(org.bukkit.Material.SKELETON_SKULL);
-            }
-            case CREEPER -> {
-                if (listContainsItemType(event.getDrops(), Material.CREEPER_HEAD)) return;
-                head = new ItemStack(org.bukkit.Material.CREEPER_HEAD);
-            }
-            case ENDER_DRAGON -> {
-                if (listContainsItemType(event.getDrops(), Material.DRAGON_HEAD)) return;
-                head = new ItemStack(org.bukkit.Material.DRAGON_HEAD);
-            }
-            case PLAYER -> {
-                if (listContainsItemType(event.getDrops(), Material.PLAYER_HEAD)) return;
-                Player player = (Player) event.getEntity();
-                head = getPlayerHead(player);
-            }
-        }
-
+        ItemStack head = getHeadForEntity(event.getEntity(), event.getDrops());
         if (head == null) return;
         EntityBeheadEvent beheadEvent = new EntityBeheadEvent(event.getEntity(), head);
         Bukkit.getPluginManager().callEvent(beheadEvent);
         if (beheadEvent.isCancelled()) return;
         event.getDrops().add(beheadEvent.getHeadToDrop());
+    }
 
+    private ItemStack getHeadForEntity(Entity entity, Collection<ItemStack> drops) {
+        ItemStack head = null;
+
+        switch (entity.getType()) {
+            case ZOMBIE -> {
+                if (listContainsItemType(drops, Material.ZOMBIE_HEAD)) return null;
+                head = new ItemStack(org.bukkit.Material.ZOMBIE_HEAD);
+            }
+            case PIGLIN -> {
+                if (listContainsItemType(drops, Material.PIGLIN_HEAD)) return null;
+                head = new ItemStack(org.bukkit.Material.PIGLIN_HEAD);
+            }
+            case WITHER_SKELETON -> {
+                if (listContainsItemType(drops, Material.WITHER_SKELETON_SKULL)) return null;
+                head = new ItemStack(org.bukkit.Material.WITHER_SKELETON_SKULL);
+            }
+            case SKELETON -> {
+                if (listContainsItemType(drops, Material.SKELETON_SKULL)) return null;
+                head = new ItemStack(org.bukkit.Material.SKELETON_SKULL);
+            }
+            case CREEPER -> {
+                if (listContainsItemType(drops, Material.CREEPER_HEAD)) return null;
+                head = new ItemStack(org.bukkit.Material.CREEPER_HEAD);
+            }
+            case ENDER_DRAGON -> {
+                if (listContainsItemType(drops, Material.DRAGON_HEAD)) return null;
+                head = new ItemStack(org.bukkit.Material.DRAGON_HEAD);
+            }
+            case PLAYER -> {
+                if (listContainsItemType(drops, Material.PLAYER_HEAD)) return null;
+                Player player = (Player) entity;
+                head = getPlayerHead(player);
+            }
+        }
+        return head;
     }
 
     private boolean listContainsItemType(@NotNull Iterable<ItemStack> list, @NotNull Material type) {