From 6316ec5fd50c92c1ae6a4276c5210a68698e5496 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Tue, 19 Aug 2014 16:42:16 +0100 Subject: [PATCH 1/2] Fix the network fix (doEmit was always being called with tryAgain false). --- src/main/java/mekanism/common/EnergyNetwork.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index 2cf736015..6035ac015 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -139,17 +139,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; From 8c58a9eaed44112923075b2b86530b640690da85 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Tue, 19 Aug 2014 19:06:50 -0400 Subject: [PATCH 2/2] Fixed crash related to OreDictCache --- src/main/java/mekanism/common/OreDictCache.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/OreDictCache.java b/src/main/java/mekanism/common/OreDictCache.java index 572b45c0e..6a37d8d7d 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.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);