add (experimental) showfake chunk-breakage preventer

DenizenScript · Jan 28, 2021 · d97a2fe · d97a2fe
1 parent 779ee76
commit d97a2fe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ShowFakeCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ShowFakeCommand.java
@@ -56,6 +56,8 @@ public ShowFakeCommand() {
     // You can enable the player to walk through fake air via <@link mechanism PlayerTag.noclip>.
     // Note as well that some clientside block effects may occur (eg fake fire may appear momentarily to actually ignite things, but won't actually damage them).
     //
+    // Warning: extremely complex chunks (those with a significant variety of block types in a small area) might not be able to retain fake blocks over time properly.
+    //
     // @Tags
     // <PlayerTag.fake_block_locations>
     // <PlayerTag.fake_block[<location>]>

diff --git a/.../main/java/com/denizenscript/denizen/nms/v1_16/impl/network/handlers/FakeBlockHelper.java b/.../main/java/com/denizenscript/denizen/nms/v1_16/impl/network/handlers/FakeBlockHelper.java
@@ -112,6 +112,12 @@ public static PacketPlayOutMapChunk handleMapChunkPacket(PacketPlayOutMapChunk o
                         outputSerial.a(blockListHelper); // writeLongs
                         continue;
                     }
+                    char dataBitsF = (char)(64 / width);
+                    int expectedLength = (4096 + dataBitsF - 1) / dataBitsF;
+                    if (blockListHelper.length != expectedLength) {
+                        return originalPacket; // This chunk is too-complex and is using non-standard chunk format. For now, just ignore it.
+                        // TODO: Add support for processing very-complex chunks (DataPaletteHash might be responsible for the unique format?)
+                    }
                     DataBits bits = new DataBits(width, 4096, blockListHelper);
                     int minY = y << 4;
                     int maxY = (y << 4) + 16;