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>

1 files changed, 7 insertions, 2 deletions

diff --git a/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java b/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java
index f805fee76c..b7aa229530 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java
@@ -1,6 +1,7 @@
 package gregtech.api.net;
 
 import com.google.common.io.ByteArrayDataInput;
+import gregtech.GT_Mod;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.multitileentity.MultiTileEntityBlock;
@@ -160,8 +161,9 @@ public class GT_Packet_TileEntity extends GT_Packet_New {
 
     @Override
     public void process(IBlockAccess aWorld) {
-        if (aWorld != null) {
-            final TileEntity tTileEntity = aWorld.getTileEntity(mX, mY, mZ);
+        if (aWorld == null) return;
+        final TileEntity tTileEntity = aWorld.getTileEntity(mX, mY, mZ);
+        try {
             final Block tBlock;
             if (tTileEntity instanceof BaseMetaTileEntity)
                 ((BaseMetaTileEntity) tTileEntity)
@@ -192,6 +194,9 @@ public class GT_Packet_TileEntity extends GT_Packet_New {
                                 mRedstone,
                                 mColor);
             }
+        } catch (Exception e) {
+            GT_Mod.GT_FML_LOGGER.error(
+                    "Exception setting tile entity data for tile entity {} at ({}, {}, {})", tTileEntity, mX, mY, mZ);
         }
     }