diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index 594ff87fa..c45ffdb9d 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -141,17 +141,15 @@ public class EnergyNetwork extends DynamicNetwork double sent = 0; boolean tryAgain = false; + int i = 0; do { - tryAgain = false; - double prev = sent; sent += doEmit(energyToSend-sent, tryAgain); - if(energyToSend-sent > 0 && sent-prev > 0) - { - tryAgain = true; - } + tryAgain = energyToSend-sent > 0 && sent-prev > 0 && i < 100; + + i++; } while(tryAgain); joulesTransmitted = sent; diff --git a/src/main/java/mekanism/common/OreDictCache.java b/src/main/java/mekanism/common/OreDictCache.java index fb0f8ce00..ce8df9988 100644 --- a/src/main/java/mekanism/common/OreDictCache.java +++ b/src/main/java/mekanism/common/OreDictCache.java @@ -6,7 +6,6 @@ import java.util.List; import mekanism.api.util.ItemInfo; import mekanism.common.util.MekanismUtils; - import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -56,6 +55,11 @@ public final class OreDictCache for(String s : OreDictionary.getOreNames()) { + if(s == null) + { + continue; + } + if(oreName.equals(s) || oreName.equals("*")) { keys.add(s);