Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: GTNewHorizons/NotEnoughItems
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.7.15-GTNH
Choose a base ref
...
head repository: GTNewHorizons/NotEnoughItems
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2.7.18-GTNH
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 10, 2025

  1. Fix NPE in ItemsTooltipLineHandler (#589)

    @Caedis
    Caedis authored Jan 10, 2025
    Copy the full SHA
    fd08a93 View commit details

  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
    @Glease
    Glease authored Jan 10, 2025
    Copy the full SHA
    31173a1 View commit details
Showing with 3 additions and 2 deletions.
  1. +1 −2 src/main/java/codechicken/nei/ClientHandler.java
  2. +2 −0 src/main/java/codechicken/nei/ItemsTooltipLineHandler.java
3 changes: 1 addition & 2 deletions src/main/java/codechicken/nei/ClientHandler.java
View file
Original file line number Diff line number Diff line change
@@ -325,9 +325,8 @@ public void loadWorld(World world, boolean fromServer) {

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;
}
2 changes: 2 additions & 0 deletions src/main/java/codechicken/nei/ItemsTooltipLineHandler.java
View file
Original file line number Diff line number Diff line change
@@ -123,6 +123,8 @@ private List<ItemStack> groupingItemStacks(List<ItemStack> items) {

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)) {