diff options
| author | DreamMasterXXL <dream-master@gmx.net> | 2020-05-10 21:30:04 +0200 |
|---|---|---|
| committer | DreamMasterXXL <dream-master@gmx.net> | 2020-05-10 21:30:04 +0200 |
| commit | 0f65292ff5bf531cf34079b8d765471f8f1e281d (patch) | |
| tree | 4bfc9bcd0cf512c6595b9d2b1fd9de3e6212c01b /src | |
| parent | 7cd941cdc0fcbdc55fc05b17e8d6fe957c26aeb0 (diff) | |
| parent | 4bb0a26d8d68ea673ea6e10912405835d6856a6e (diff) | |
| download | GT5-Unofficial-0f65292ff5bf531cf34079b8d765471f8f1e281d.tar.gz GT5-Unofficial-0f65292ff5bf531cf34079b8d765471f8f1e281d.tar.bz2 GT5-Unofficial-0f65292ff5bf531cf34079b8d765471f8f1e281d.zip | |
Merge branch 'experimental' into HEE-Bees
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java | 11 |
1 files changed, 5 insertions, 6 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 b57f0396a8..5eff7a3c55 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 @@ -126,11 +126,11 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas 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) { + if (dX == -x || dX == x || dY == 0 || dY == y || dZ == -z || dZ == z) { Block tBlock = aBaseMetaTileEntity.getBlockOffset(dX, dY, dZ); int tMeta = aBaseMetaTileEntity.getMetaIDOffset(dX, dY, dZ); - if (y == 0) { - if (dX == -x || dX == x || dZ == -z || dZ == z) { + if (dY == 0) { // TOP + if (dX == -x || dX == x || dZ == -z || dZ == z) { // Top Border if (tBlock != GregTech_API.sBlockReinforced || tMeta != 2) { if (debugCleanroom) { GT_Log.out.println( @@ -139,8 +139,7 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas } return false; } - } else if (dX == 0 && dZ == 0) { - } else { + } else if (dX != 0 || dZ != 0) { // Top Inner exclude center if (tBlock != GregTech_API.sBlockCasings3 || tMeta != 11) { if (debugCleanroom) { GT_Log.out.println( @@ -209,7 +208,7 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(dX, dY, dZ); if (tTileEntity != null) { IMetaTileEntity aMetaTileEntity = tTileEntity.getMetaTileEntity(); - if (aMetaTileEntity != null && aMetaTileEntity instanceof GT_MetaTileEntity_BasicMachine_GT_Recipe) { + if (aMetaTileEntity instanceof GT_MetaTileEntity_BasicMachine_GT_Recipe) { if (debugCleanroom) { GT_Log.out.println( "Cleanroom: Machine detected, adding pointer back to cleanroom" |