Compare commits

...
Author SHA1 Message Date
Martin Robertz a0832be3e8 Merge remote-tracking branch 'slprime/fix_item_rendering_cache' into dev 2025-01-10 15:40:58 +01:00
Martin Robertz 96a5c0cf88 Merge remote-tracking branch 'slprime/extend_subset_widget' into dev 2025-01-10 15:40:53 +01:00
Caedis 887afbfb8d Merge remote-tracking branch 'origin/master' into dev 2025-01-10 06:46:51 -06:00
Caedis 84290c5bc9 Merge branch 'master' into fix_item_rendering_cache 2025-01-10 12:46:02 +00:00
Caedis 1caf3c7334 Merge branch 'master' into extend_subset_widget 2025-01-10 12:45:50 +00:00
Glease 31173a1fbd 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
2025-01-10 17:11:52 +08:00
Caedis fd08a93554 Fix NPE in ItemsTooltipLineHandler (#589) 2025-01-10 10:42:23 +02:00
2 changed files with 3 additions and 2 deletions

No files matched your search

@@ -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;
}
@@ -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)) {