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