Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-31 04:46:37 +00:00
Code Issues Releases Activity

修改connection

Browse Source
This commit is contained in:
XiaoMoMi
2025-05-31 18:36:52 +08:00
parent 794dd13b17
commit d17c1be2d4
4 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/BukkitSenderFactory.java
View File

@@ -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) {

21
bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java
View File

@@ -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;
}

4
bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/LightUtils.java
View File

@@ -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);
}
}
}