From eb5fb0de0130ae5cbef1251d540ea6abb306a4b2 Mon Sep 17 00:00:00 2001
From: jhqwqmc <2110242767@qq.com>
Date: Tue, 25 Mar 2025 18:07:46 +0800
Subject: [PATCH] =?UTF-8?q?fix(bukkit):=20=E4=BF=AE=E5=A4=8D=E7=94=B1?=
 =?UTF-8?q?=E4=BA=8E=E9=A2=91=E9=81=93=E6=B3=A8=E5=86=8C=E6=97=B6=E6=9C=BA?=
 =?UTF-8?q?=E6=BB=9E=E5=90=8E=E5=AF=BC=E8=87=B4mod=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=9A=84=E8=A7=86=E8=A7=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/network/BukkitNetworkManager.java  | 31 +++++++++++++++++++
 .../craftengine/bukkit/util/Reflections.java  |  6 ++++
 2 files changed, 37 insertions(+)

diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/BukkitNetworkManager.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/BukkitNetworkManager.java
index 1226fb980..4e2ca3e6a 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/BukkitNetworkManager.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/BukkitNetworkManager.java
@@ -19,7 +19,9 @@ import net.momirealms.craftengine.core.util.FriendlyByteBuf;
 import net.momirealms.craftengine.core.util.ListMonitor;
 import net.momirealms.craftengine.core.util.TriConsumer;
 import net.momirealms.craftengine.core.util.VersionHelper;
+import net.momirealms.craftengine.core.world.ChunkPos;
 import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -31,6 +33,7 @@ import org.bukkit.event.player.PlayerRegisterChannelEvent;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.lang.reflect.InvocationTargetException;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -172,6 +175,34 @@ public class BukkitNetworkManager implements NetworkManager, Listener {
         int blockRegistrySize = RegistryUtils.currentBlockRegistrySize();
         byte[] payload = ("cp:" + blockRegistrySize).getBytes(StandardCharsets.UTF_8);
         player.sendPluginMessage(plugin.bootstrap(), MOD_CHANNEL, payload);
+        sendClientModPlayerChunk(player, user);
+    }
+
+    private static void sendClientModPlayerChunk(Player player, NetWorkUser user) {
+        try {
+            Chunk centerChunk = player.getLocation().getChunk();
+            int centerX = centerChunk.getX();
+            int centerZ = centerChunk.getZ();
+            for (int xOffset = -1; xOffset <= 1; xOffset++) {
+                for (int zOffset = -1; zOffset <= 1; zOffset++) {
+                    int targetX = centerX + xOffset;
+                    int targetZ = centerZ + zOffset;
+                    Chunk chunk = centerChunk.getWorld().getChunkAt(targetX, targetZ);
+                    Object worldServer = Reflections.field$CraftChunk$worldServer.get(chunk);
+                    Object chunkSource = Reflections.field$ServerLevel$chunkSource.get(worldServer);
+                    Object levelChunk = Reflections.method$ServerChunkCache$getChunkAtIfLoadedMainThread.invoke(chunkSource, chunk.getX(), chunk.getZ());
+                    if (levelChunk == null) continue;
+                    long chunkKey = ChunkPos.asLong(chunk.getX(), chunk.getZ());
+                    Object chunkHolder = Reflections.method$ServerChunkCache$getVisibleChunkIfPresent.invoke(chunkSource, chunkKey);
+                    if (chunkHolder == null) continue;
+                    Object lightEngine = Reflections.field$ChunkHolder$lightEngine.get(chunkHolder);
+                    Object packet = Reflections.constructor$ClientboundLevelChunkWithLightPacket.newInstance(levelChunk, lightEngine, null, null);
+                    user.sendPacket(packet, false);
+                }
+            }
+        } catch (Exception e) {
+            CraftEngine.instance().logger().warn("Failed to send chunk correction packet", e);
+        }
     }
 
     @Override
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java
index 182629ae5..3083a651d 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java
@@ -5496,4 +5496,10 @@ public class Reflections {
                     clazz$Entity, clazz$SynchedEntityData, 0
             )
     );
+
+    public static final Constructor<?> constructor$ClientboundLevelChunkWithLightPacket = requireNonNull(
+            ReflectionUtils.getConstructor(
+                    clazz$ClientboundLevelChunkWithLightPacket, clazz$LevelChunk, clazz$LevelLightEngine, BitSet.class, BitSet.class
+            )
+    );
 }