From 9169d555b141de150b0234dacea90b0319b91a43 Mon Sep 17 00:00:00 2001 From: JoeStaff <125237856+JoeStaff@users.noreply.github.com> Date: Thu, 19 Mar 2026 19:07:59 -0500 Subject: [PATCH 1/3] Resolves issue causing edge case crash --- .../deepmoblearning/common/events/EntityDeathHandler.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/xt9/deepmoblearning/common/events/EntityDeathHandler.java b/src/main/java/xt9/deepmoblearning/common/events/EntityDeathHandler.java index fdeb604..da79a46 100644 --- a/src/main/java/xt9/deepmoblearning/common/events/EntityDeathHandler.java +++ b/src/main/java/xt9/deepmoblearning/common/events/EntityDeathHandler.java @@ -113,8 +113,11 @@ private static void handleMobDeath(LivingDeathEvent event) { } private static void cullEntityBlacklist() { + if (killedEntityUUIDBlacklist.isEmpty()) return; + UUID lastUUID = killedEntityUUIDBlacklist.get(killedEntityUUIDBlacklist.size() - 1); - killedEntityUUIDBlacklist.clear(); + + killedEntityUUIDBlacklist = new ArrayList<>(); killedEntityUUIDBlacklist.add(lastUUID); } From 846817f853a47c7747deef9e777b72aa07eeca10 Mon Sep 17 00:00:00 2001 From: JoeStaff <125237856+JoeStaff@users.noreply.github.com> Date: Thu, 19 Mar 2026 19:34:13 -0500 Subject: [PATCH 2/3] Update EntityDeathHandler.java --- .../xt9/deepmoblearning/common/events/EntityDeathHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/xt9/deepmoblearning/common/events/EntityDeathHandler.java b/src/main/java/xt9/deepmoblearning/common/events/EntityDeathHandler.java index da79a46..2a6d49d 100644 --- a/src/main/java/xt9/deepmoblearning/common/events/EntityDeathHandler.java +++ b/src/main/java/xt9/deepmoblearning/common/events/EntityDeathHandler.java @@ -203,7 +203,7 @@ private static NonNullList updateAndReturnModels(ItemStack deepLearne } private static boolean isEntityBlacklisted(EntityLivingBase entityLiving) { - return killedEntityUUIDBlacklist.stream().filter(uuid -> uuid.toString().equals(entityLiving.getUniqueID().toString())).collect(Collectors.toList()).size() > 0; + return killedEntityUUIDBlacklist.contains(entityLiving.getUniqueID()); } private static void attuneTrialKey(ItemStack trialKey, ItemStack dataModel, LivingDeathEvent event, EntityPlayerMP player) { From 0f60ded9eea5b48b45bf82ffe7dc7bbb797919dc Mon Sep 17 00:00:00 2001 From: JoeStaff <125237856+JoeStaff@users.noreply.github.com> Date: Thu, 19 Mar 2026 20:02:00 -0500 Subject: [PATCH 3/3] Update EntityDeathHandler.java --- .../xt9/deepmoblearning/common/events/EntityDeathHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/xt9/deepmoblearning/common/events/EntityDeathHandler.java b/src/main/java/xt9/deepmoblearning/common/events/EntityDeathHandler.java index 2a6d49d..6f7dd16 100644 --- a/src/main/java/xt9/deepmoblearning/common/events/EntityDeathHandler.java +++ b/src/main/java/xt9/deepmoblearning/common/events/EntityDeathHandler.java @@ -117,7 +117,7 @@ private static void cullEntityBlacklist() { UUID lastUUID = killedEntityUUIDBlacklist.get(killedEntityUUIDBlacklist.size() - 1); - killedEntityUUIDBlacklist = new ArrayList<>(); + killedEntityUUIDBlacklist = NonNullList.create(); killedEntityUUIDBlacklist.add(lastUUID); }