From 9d2aecff886fb71634584f76e6542d0f88148d37 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 25 Jul 2014 20:26:37 +0800 Subject: [PATCH] Fixed a bunch of crashes reported to openeye. --- src/main/java/crazypants/enderio/conduit/ConduitUtil.java | 2 ++ .../java/crazypants/enderio/machine/still/BlockVat.java | 2 +- .../java/crazypants/enderio/machine/tank/BlockTank.java | 2 +- .../crazypants/enderio/nei/EnchanterRecipeHandler.java | 8 ++++---- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java index 7f92a84e..386a16bd 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java @@ -334,6 +334,8 @@ public class ConduitUtil { return true; } else if(mode == RedstoneControlMode.NEVER) { return false; + } else if(mode == null) { + return false; } int signalStrength = getInternalSignalForColor(bundle, col); diff --git a/src/main/java/crazypants/enderio/machine/still/BlockVat.java b/src/main/java/crazypants/enderio/machine/still/BlockVat.java index acd75549..feccf642 100644 --- a/src/main/java/crazypants/enderio/machine/still/BlockVat.java +++ b/src/main/java/crazypants/enderio/machine/still/BlockVat.java @@ -139,7 +139,7 @@ public class BlockVat extends AbstractMachineBlock { if(filled == null) { //this shouldn't be necessary but it appears to be a bug as the above method doesnt work FluidContainerData[] datas = FluidContainerRegistry.getRegisteredFluidContainerData(); for (FluidContainerData data : datas) { - if(data.fluid.getFluid().getName().equals(available.getFluid().getName()) && data.emptyContainer.isItemEqual(item)) { + if(data != null && data.fluid.getFluid().getName().equals(available.getFluid().getName()) && data.emptyContainer.isItemEqual(item)) { res = data.filledContainer.copy(); filled = FluidContainerRegistry.getFluidForFilledItem(res); } diff --git a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java index fb8b1ee5..c5a2ed9c 100644 --- a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java @@ -99,7 +99,7 @@ public class BlockTank extends AbstractMachineBlock implements IAdvanc if(filled == null) { //this shouldn't be necessary but it appears to be a bug as the above method doesnt work FluidContainerData[] datas = FluidContainerRegistry.getRegisteredFluidContainerData(); for (FluidContainerData data : datas) { - if(data.fluid.getFluid().getName().equals(available.getFluid().getName()) && data.emptyContainer.isItemEqual(item)) { + if(data != null && data.fluid.getFluid().getName().equals(available.getFluid().getName()) && data.emptyContainer.isItemEqual(item)) { res = data.filledContainer.copy(); filled = FluidContainerRegistry.getFluidForFilledItem(res); } diff --git a/src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java b/src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java index 6d7308bd..3cecf77c 100644 --- a/src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java @@ -64,12 +64,12 @@ public class EnchanterRecipeHandler extends TemplateRecipeHandler { if(result == null || result.getItem() != Items.enchanted_book) { return; } - Map enchants = EnchantmentHelper.getEnchantments(result); + Map enchants = EnchantmentHelper.getEnchantments(result); List recipes = EnchanterRecipeManager.getInstance().getRecipes(); - for(Short id : enchants.keySet()) { - if(id != null && id >= 0 && id < Enchantment.enchantmentsList.length) { - Enchantment ench = Enchantment.enchantmentsList[id]; + for(Number id : enchants.keySet()) { + if(id != null && id.intValue() >= 0 && id.intValue() < Enchantment.enchantmentsList.length) { + Enchantment ench = Enchantment.enchantmentsList[id.intValue()]; if(ench != null && ench.getName() != null) { for (EnchanterRecipe recipe : recipes) {