Send forget packet to avoid invisible chunk sections (#3005)

IntellectualSites · Nov 23, 2024 · c4267b3 · c4267b3
1 parent 2158981
commit c4267b3
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/...java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_3/PaperweightPlatformAdapter.java b/...java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_3/PaperweightPlatformAdapter.java
@@ -24,6 +24,7 @@
 import net.minecraft.core.Holder;
 import net.minecraft.core.IdMap;
 import net.minecraft.core.Registry;
+import net.minecraft.network.protocol.game.ClientboundForgetLevelChunkPacket;
 import net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ChunkHolder;
@@ -335,7 +336,6 @@ public static void sendChunk(IntPair pair, ServerLevel nmsWorld, int chunkX, int
         if (chunkHolder == null) {
             return;
         }
-        ChunkPos coordIntPair = new ChunkPos(chunkX, chunkZ);
         LevelChunk levelChunk;
         if (PaperLib.isPaper()) {
             // getChunkAtIfLoadedImmediately is paper only
@@ -353,6 +353,10 @@ public static void sendChunk(IntPair pair, ServerLevel nmsWorld, int chunkX, int
         }
         MinecraftServer.getServer().execute(() -> {
             try {
+                ChunkPos pos = levelChunk.getPos();
+                // NOTE: the ClientboundForgetLevelChunkPacket packet is required on 1.21.3
+                // as the client won't update empty -> non-empty sections properly otherwise
+                ClientboundForgetLevelChunkPacket forget = new ClientboundForgetLevelChunkPacket(pos);
                 ClientboundLevelChunkWithLightPacket packet;
                 if (PaperLib.isPaper()) {
                     packet = new ClientboundLevelChunkWithLightPacket(
@@ -371,7 +375,10 @@ public static void sendChunk(IntPair pair, ServerLevel nmsWorld, int chunkX, int
                             null
                     );
                 }
-                nearbyPlayers(nmsWorld, coordIntPair).forEach(p -> p.connection.send(packet));
+                nearbyPlayers(nmsWorld, pos).forEach(p -> {
+                    p.connection.send(forget);
+                    p.connection.send(packet);
+                });
             } finally {
                 NMSAdapter.endChunkPacketSend(nmsWorld.getWorld().getName(), pair, lockHolder);
             }