aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorGlease <4586901+Glease@users.noreply.github.com>2022-08-10 13:07:08 +0800
committerGitHub <noreply@github.com>2022-08-10 07:07:08 +0200
commit0b53aeb032fb7fdfcf6b02d75f75cdfe84e20d89 (patch)
tree6730ed376e5a2c17bbf9a27e73741fc531294b93 /src/main/java/gregtech/common
parent39a672b7c4b7b9033d4577c6dae1d4ea0a414ee3 (diff)
downloadGT5-Unofficial-0b53aeb032fb7fdfcf6b02d75f75cdfe84e20d89.tar.gz
GT5-Unofficial-0b53aeb032fb7fdfcf6b02d75f75cdfe84e20d89.tar.bz2
GT5-Unofficial-0b53aeb032fb7fdfcf6b02d75f75cdfe84e20d89.zip
do not return IAlignment if MTE is not IAlignmentProvider (#1234)
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/render/GT_RenderedTexture.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/render/GT_RenderedTexture.java b/src/main/java/gregtech/common/render/GT_RenderedTexture.java
index 8cead2889b..94b0e72419 100644
--- a/src/main/java/gregtech/common/render/GT_RenderedTexture.java
+++ b/src/main/java/gregtech/common/render/GT_RenderedTexture.java
@@ -1,5 +1,6 @@
package gregtech.common.render;
+import com.gtnewhorizon.structurelib.alignment.IAlignment;
import com.gtnewhorizon.structurelib.alignment.IAlignmentProvider;
import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing;
import com.gtnewhorizon.structurelib.alignment.enumerable.Flip;
@@ -365,16 +366,18 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
final World w = player.getEntityWorld();
if (w == null) return ExtendedFacing.DEFAULT;
final TileEntity te = w.getTileEntity(x, y, z);
+ IAlignment alignment = null;
if (te instanceof IGregTechTileEntity) {
final IMetaTileEntity meta = ((IGregTechTileEntity) te).getMetaTileEntity();
if (meta instanceof IAlignmentProvider) {
- return ((IAlignmentProvider) meta).getAlignment().getExtendedFacing();
+ alignment = ((IAlignmentProvider) meta).getAlignment();
} else if (meta != null) {
return ExtendedFacing.of(ForgeDirection.getOrientation(meta.getBaseMetaTileEntity().getFrontFacing()));
}
} else if (te instanceof IAlignmentProvider) {
- return ((IAlignmentProvider) te).getAlignment().getExtendedFacing();
+ alignment = ((IAlignmentProvider) te).getAlignment();
}
+ if (alignment != null) return alignment.getExtendedFacing();
return ExtendedFacing.DEFAULT;
}
-} \ No newline at end of file
+}