diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-02-28 23:59:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-28 23:59:47 +0100 |
| commit | 8b1e36ad80f51fba61a419bcf42f7fbeb71e78fe (patch) | |
| tree | 634a454230d5230ac2b78df96baf19bb256eba63 /src/main/java/gregtech/common | |
| parent | c1c174b76cf9d344209e389c1959da4313e60bea (diff) | |
| parent | 26c805e9acdd30b7af443c32c1363c1610296b66 (diff) | |
| download | GT5-Unofficial-8b1e36ad80f51fba61a419bcf42f7fbeb71e78fe.tar.gz GT5-Unofficial-8b1e36ad80f51fba61a419bcf42f7fbeb71e78fe.tar.bz2 GT5-Unofficial-8b1e36ad80f51fba61a419bcf42f7fbeb71e78fe.zip | |
Merge pull request #913 from Dimach/unstable
Fix cleanroom bug (checked only west and north side).
Diffstat (limited to 'src/main/java/gregtech/common')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java index 0ba05cab5c..25add8402b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java @@ -1,9 +1,5 @@ package gregtech.common.tileentities.machines.multi; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Locale; - import gregtech.api.GregTech_API; import gregtech.api.enums.Textures; import gregtech.api.gui.GT_GUIContainer_MultiMachine; @@ -12,17 +8,12 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; import net.minecraft.block.Block; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBase { @@ -86,8 +77,8 @@ public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack a } } if(y>-2){return false;} - for(int dX=-x;dX<x;dX++){ - for(int dZ=-z;dZ<z;dZ++){ + for(int dX=-x;dX<=x;dX++){ + for(int dZ=-z;dZ<=z;dZ++){ for(int dY=0;dY>=y;dY--){ if(dX==-x||dX==x||dY==-y||dY==y||dZ==-z||dZ==z){ Block tBlock = aBaseMetaTileEntity.getBlockOffset(dX, dY, dZ); @@ -124,8 +115,8 @@ public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack a } } if(mMaintenanceHatches.size()!=1||mEnergyHatches.size()!=1||mDoorCount!=2||mHullCount>10){return false;} - for(int dX=-x+1;dX<x-1;dX++){ - for(int dZ=z+1;dZ<z-1;dZ++){ + for(int dX=-x+1;dX<=x-1;dX++){ + for(int dZ=z+1;dZ<=z-1;dZ++){ for(int dY=-1;dY>=y+1;dY--){ IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(dX, dY, dZ); if(tTileEntity!=null){ |