From ce3bb08411b3a6aae6cd7b71c8b2bdc98fb09708 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 12 May 2016 15:27:04 -0400 Subject: [PATCH] Fixed Fusion Reactor air block check --- src/main/java/mekanism/common/item/ItemOtherDust.java | 5 +++++ .../mekanism/generators/common/FusionReactor.java | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/mekanism/common/item/ItemOtherDust.java b/src/main/java/mekanism/common/item/ItemOtherDust.java index 5cc94da67..b81290d61 100644 --- a/src/main/java/mekanism/common/item/ItemOtherDust.java +++ b/src/main/java/mekanism/common/item/ItemOtherDust.java @@ -27,6 +27,11 @@ public class ItemOtherDust extends ItemMekanism { for(int i = 0; i < subtypes.length; i++) { + if(i == 2) + { + continue; + } + icons[i] = register.registerIcon("mekanism:" + subtypes[i] + "Dust"); } } diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index 44b3eee6f..c6b39fd32 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -23,7 +23,6 @@ import mekanism.common.Mekanism; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.generators.common.item.ItemHohlraum; import mekanism.generators.common.tile.reactor.TileEntityReactorController; -import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -465,13 +464,13 @@ public class FusionReactor implements IFusionReactor { for(int x = -1; x <= 1; x++) { - for(int y = -1; x <= 1; x++) + for(int y = -1; y <= 1; y++) { - for(int z = -1; x <= 1; x++) + for(int z = -1; z <= 1; z++) { - Block tile = centre.clone().translate(x, y, z).getBlock(controller.getWorldObj()); - - if(!tile.isAir(controller.getWorldObj(), x, y, z)) + Coord4D trans = centre.clone().translate(x, y, z); + + if(!trans.isAirBlock(controller.getWorldObj())) { return false; }