From d17c1be2d4853a6160062c477f69032e1a1bf0d1 Mon Sep 17 00:00:00 2001
From: XiaoMoMi <littlemomi@qq.com>
Date: Sat, 31 May 2025 18:36:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9connection?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/command/BukkitSenderFactory.java   |  2 +-
 .../plugin/user/BukkitServerPlayer.java       | 21 ++++++++++++++++---
 .../craftengine/bukkit/util/LightUtils.java   |  4 ++--
 .../core/plugin/network/NetWorkUser.java      |  3 ++-
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/BukkitSenderFactory.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/BukkitSenderFactory.java
index 4725c79eb..132bdd29f 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/BukkitSenderFactory.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/BukkitSenderFactory.java
@@ -42,7 +42,7 @@ public class BukkitSenderFactory extends SenderFactory<BukkitCraftEngine, Comman
     protected void sendMessage(CommandSender sender, Component message) {
         // we can safely send async for players and the console - otherwise, send it sync
         if (sender instanceof Player player) {
-            FastNMS.INSTANCE.sendPacket(FastNMS.INSTANCE.method$CraftPlayer$getHandle(player), FastNMS.INSTANCE.constructor$ClientboundSystemChatPacket(ComponentUtils.adventureToMinecraft(message), false));
+            FastNMS.INSTANCE.sendPacket(FastNMS.INSTANCE.field$Player$connection$connection(FastNMS.INSTANCE.method$CraftPlayer$getHandle(player)), FastNMS.INSTANCE.constructor$ClientboundSystemChatPacket(ComponentUtils.adventureToMinecraft(message), false));
         } else if (sender instanceof ConsoleCommandSender commandSender) {
             commandSender.sendMessage(LegacyComponentSerializer.legacySection().serialize(message));
         } else if (sender instanceof RemoteConsoleCommandSender commandSender) {
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java
index 64090cc91..240589ece 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java
@@ -3,6 +3,7 @@ package net.momirealms.craftengine.bukkit.plugin.user;
 import com.google.common.collect.Lists;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
 import net.kyori.adventure.text.Component;
 import net.momirealms.craftengine.bukkit.block.BukkitBlockManager;
 import net.momirealms.craftengine.bukkit.item.BukkitItemManager;
@@ -56,7 +57,7 @@ public class BukkitServerPlayer extends Player {
     private ProtocolVersion protocolVersion = ProtocolVersion.UNKNOWN;
     // connection state
     private final Channel channel;
-    private final Object connection;
+    private ChannelHandler connection;
     private String name;
     private UUID uuid;
     private ConnectionState decoderState;
@@ -108,7 +109,13 @@ public class BukkitServerPlayer extends Player {
     public BukkitServerPlayer(BukkitCraftEngine plugin, Channel channel) {
         this.channel = channel;
         this.plugin = plugin;
-        this.connection = channel.pipeline().get("packet_handler");
+        for (String name : channel.pipeline().names()) {
+            ChannelHandler handler = channel.pipeline().get(name);
+            if (Reflections.clazz$Connection.isInstance(handler)) {
+                this.connection = handler;
+                break;
+            }
+        }
     }
 
     public void setPlayer(org.bukkit.entity.Player player) {
@@ -778,7 +785,15 @@ public class BukkitServerPlayer extends Player {
     }
 
     @Override
-    public Object connection() {
+    public ChannelHandler connection() {
+        if (this.connection == null) {
+            Object serverPlayer = serverPlayer();
+            if (serverPlayer != null) {
+                this.connection = (ChannelHandler) FastNMS.INSTANCE.field$Player$connection$connection(serverPlayer);
+            } else {
+                throw new IllegalStateException("Cannot init or find connection instance for player " + name());
+            }
+        }
         return this.connection;
     }
 
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/LightUtils.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/LightUtils.java
index a7ec85455..2bf685083 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/LightUtils.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/LightUtils.java
@@ -26,11 +26,11 @@ public class LightUtils {
                 Object chunkPos = FastNMS.INSTANCE.constructor$ChunkPos((int) chunkKey, (int) (chunkKey >> 32));
                 Object lightPacket = FastNMS.INSTANCE.constructor$ClientboundLightUpdatePacket(chunkPos, lightEngine, entry.getValue(), entry.getValue());
                 for (Object player : players) {
-                    FastNMS.INSTANCE.sendPacket(player, lightPacket);
+                    FastNMS.INSTANCE.sendPacket(FastNMS.INSTANCE.field$Player$connection$connection(player), lightPacket);
                 }
             }
         } catch (Exception e) {
-            CraftEngine.instance().logger().warn("Could not update light for world " + world.getName());
+            CraftEngine.instance().logger().warn("Could not update light for world " + world.getName(), e);
         }
     }
 }
diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/network/NetWorkUser.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/network/NetWorkUser.java
index f12414157..2dc4f282a 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/plugin/network/NetWorkUser.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/network/NetWorkUser.java
@@ -1,6 +1,7 @@
 package net.momirealms.craftengine.core.plugin.network;
 
 import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
 import net.kyori.adventure.text.Component;
 import net.momirealms.craftengine.core.plugin.Plugin;
 import net.momirealms.craftengine.core.util.Key;
@@ -46,7 +47,7 @@ public interface NetWorkUser {
 
     Object platformPlayer();
 
-    Object connection();
+    ChannelHandler connection();
 
     Map<Integer, EntityPacketHandler> entityPacketHandlers();