From 57543ea5994402f6859a83b55e2cdddd12b4f069 Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Sun, 4 Sep 2022 00:01:02 +0800
Subject: merge in ASM-ed in changes from gt++ (#1339)

* merge in ASM-ed in changes from gt++

* Spotless apply for branch gtpp-asm-merge for #1339 (#1340)

Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .../java/gregtech/api/metatileentity/BaseMetaTileEntity.java     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/main/java/gregtech/api/metatileentity')

diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index 76a6d3237e..cdc81220e6 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -1839,7 +1839,14 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
 
     @Override
     public void setMetaTileEntity(IMetaTileEntity aMetaTileEntity) {
-        mMetaTileEntity = (MetaTileEntity) aMetaTileEntity;
+        if (aMetaTileEntity instanceof MetaTileEntity || aMetaTileEntity == null)
+            mMetaTileEntity = (MetaTileEntity) aMetaTileEntity;
+        else {
+            GT_FML_LOGGER.error(
+                    "Unknown meta tile entity set! Class {}, inventory name {}.",
+                    aMetaTileEntity.getClass(),
+                    aMetaTileEntity.getInventoryName());
+        }
     }
 
     public byte getLightValue() {
-- 
cgit