Add extra data to SPacketChunkData getUpdateTag crashes.

src/main/java/io/github/lxgaming/sledgehammer/configuration/category/mixin/CoreMixinCategory.java

@@ -98,6 +98,10 @@ public class CoreMixinCategory {
     @Mapping(value = "core.network.play.server.SPacketJoinGameMixin")
     @Setting(value = "world-type-length", comment = "If 'true', increases the maximum length for a WorldType name in SPacketJoinGame packet.")
     private boolean worldTypeLength = false;
+
+    @Mapping(value = "core.network.play.server.SPacketChunkDataMixin")
+    @Setting(value = "get-update-tag-crash", comment = "If 'true', adds TileEntity data to the crash report from calls to 'getUpdateTag' that fail.")
+    private boolean getUpdateTagCrash = false;
 
     public boolean isAdvancementReload() {
         return advancementReload;
@@ -166,4 +170,8 @@ public boolean isPlayerChunkMap() {
     public boolean isWorldTypeLength() {
         return worldTypeLength;
     }
-}
+
+    public boolean isGetUpdateTagCrash() {
+        return getUpdateTagCrash;
+    }
+}

src/main/java/io/github/lxgaming/sledgehammer/mixin/core/network/play/server/SPacketChunkDataMixin.java

@@ -0,0 +1,26 @@
+package io.github.lxgaming.sledgehammer.mixin.core.network.play.server;
+
+import net.minecraft.crash.CrashReport;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.play.server.SPacketChunkData;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ReportedException;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin (value = SPacketChunkData.class, priority = 1337)
+public class SPacketChunkDataMixin {
+
+    @Redirect (method = "<init>(Lnet/minecraft/world/chunk/Chunk;I)V", at = @At (value = "INVOKE", target = "Lnet/minecraft/tileentity/TileEntity;getUpdateTag()Lnet/minecraft/nbt/NBTTagCompound;"))
+    public NBTTagCompound onGetUpdateTag(TileEntity tile) {
+        try {
+            return tile.getUpdateTag();
+        } catch (Throwable t) {
+            CrashReport crashReport = CrashReport.makeCrashReport(t, "Getting update tag");
+            tile.addInfoToCrashReport(crashReport.makeCategory("Block entity being queried"));
+            throw new ReportedException(crashReport);
+        }
+    }
+
+}

src/main/resources/mixins.sledgehammer.core.json

@@ -16,6 +16,7 @@
     "entity.EntityMixin_Teleport",
     "item.ItemStackMixin_Exploit",
     "item.ItemWritableBookMixin",
+    "network.play.server.SPacketChunkDataMixin",
     "network.play.server.SPacketJoinGameMixin",
     "network.NetHandlerPlayServerMixin_Book",
     "network.NetHandlerPlayServerMixin_Event",
@@ -38,4 +39,4 @@
   "injectors": {
     "defaultRequire": 1
   }
-}
+}