From 09432dd9868daa4ecd673a8f5cefb6c892ff24eb Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sun, 5 Jun 2022 12:09:30 -0400 Subject: [PATCH] Fix memory leak caused by mob spawner items --- src/main/java/codechicken/nei/ClientHandler.java | 2 ++ src/main/java/codechicken/nei/ItemMobSpawner.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/main/java/codechicken/nei/ClientHandler.java b/src/main/java/codechicken/nei/ClientHandler.java index e8a17444..7004839e 100644 --- a/src/main/java/codechicken/nei/ClientHandler.java +++ b/src/main/java/codechicken/nei/ClientHandler.java @@ -328,6 +328,8 @@ public class ClientHandler if (!Minecraft.getMinecraft().isSingleplayer())//wait for server to initiate in singleplayer NEIClientConfig.loadWorld("remote/" + ClientUtils.getServerIP().replace(':', '~')); + + ItemMobSpawner.clearEntityReferences(world); } lastworld = world; diff --git a/src/main/java/codechicken/nei/ItemMobSpawner.java b/src/main/java/codechicken/nei/ItemMobSpawner.java index 43ccf406..87f028aa 100644 --- a/src/main/java/codechicken/nei/ItemMobSpawner.java +++ b/src/main/java/codechicken/nei/ItemMobSpawner.java @@ -96,6 +96,10 @@ public class ItemMobSpawner extends ItemBlock return e; } + public static void clearEntityReferences(World newWorld) { + entityHashMap.values().removeIf(e -> e.worldObj != newWorld); + } + private void setDefaultTag(ItemStack itemstack) { if (!IDtoNameMap.containsKey(itemstack.getItemDamage())) itemstack.setItemDamage(idPig);