From fd08a93554789f81abeda56e3a317e5c3f09524b Mon Sep 17 00:00:00 2001 From: Caedis Date: Fri, 10 Jan 2025 08:42:23 +0000 Subject: [PATCH 1/2] Fix NPE in ItemsTooltipLineHandler (#589) --- src/main/java/codechicken/nei/ItemsTooltipLineHandler.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/codechicken/nei/ItemsTooltipLineHandler.java b/src/main/java/codechicken/nei/ItemsTooltipLineHandler.java index 11009002..24ddc58c 100644 --- a/src/main/java/codechicken/nei/ItemsTooltipLineHandler.java +++ b/src/main/java/codechicken/nei/ItemsTooltipLineHandler.java @@ -123,6 +123,8 @@ public class ItemsTooltipLineHandler implements ITooltipLineHandler { for (ItemStack stack : items) { final NBTTagCompound nbTag = StackInfo.itemStackToNBT(stack, true); + if (nbTag == null) continue; + final String GUID = StackInfo.getItemStackGUID(stack); if (!unique.containsKey(GUID)) { From 31173a1fbd249ce4adaad75feb52b64b33c0daea Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Fri, 10 Jan 2025 17:11:52 +0800 Subject: [PATCH 2/2] fix memory leak fixes not working for MP (#590) #258 addresses the memory leak in ItemMobSpawner. Unfortunately the clean up handler is not consistently called on every world unloaded. This PR fixes this issue by moving the call out of that if block --- src/main/java/codechicken/nei/ClientHandler.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/codechicken/nei/ClientHandler.java b/src/main/java/codechicken/nei/ClientHandler.java index 50078c81..6e51761e 100644 --- a/src/main/java/codechicken/nei/ClientHandler.java +++ b/src/main/java/codechicken/nei/ClientHandler.java @@ -325,9 +325,8 @@ public class ClientHandler { if (!Minecraft.getMinecraft().isSingleplayer()) // wait for server to initiate in singleplayer NEIClientConfig.loadWorld("remote/" + ClientUtils.getServerIP().replace(':', '~')); - - ItemMobSpawner.clearEntityReferences(world); } + ItemMobSpawner.clearEntityReferences(world); lastworld = world; }