Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-25 09:59:20 +00:00
Code Issues Releases Activity

修复资源包发送相关问题

Browse Source
This commit is contained in:
XiaoMoMi
2025-07-12 03:25:50 +08:00
parent 421bd399c2
commit 1d7f70a60c
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java
View File

@@ -2295,7 +2295,7 @@ public class PacketConsumers {
public static final TriConsumer<NetWorkUser, NMSPacketEvent, Object> RESOURCE_PACK_RESPONSE = (user, event, packet) -> {
try {
Object action = FastNMS.INSTANCE.field$ServerboundResourcePackPacket$action(packet);
if (action == null) return;
if (VersionHelper.isOrAbove1_20_3()) {
UUID uuid = FastNMS.INSTANCE.field$ServerboundResourcePackPacket$id(packet);
if (!user.isResourcePackLoading(uuid)) {
@@ -2303,9 +2303,15 @@ public class PacketConsumers {
return;
}
}
if (action == null) {
user.kick(Component.text("Corrupted ResourcePackResponse Packet"));
return;
}
// 检查是否是拒绝
if (Config.kickOnDeclined()) {
if (action == NetworkReflections.instance$ServerboundResourcePackPacket$Action$DECLINED) {
if (action == NetworkReflections.instance$ServerboundResourcePackPacket$Action$DECLINED || action == NetworkReflections.instance$ServerboundResourcePackPacket$Action$DISCARDED) {
user.kick(Component.translatable("multiplayer.requiredTexturePrompt.disconnect"));
return;
}
@@ -2320,7 +2326,7 @@ public class PacketConsumers {
}
}
boolean isTerminal = action == NetworkReflections.instance$ServerboundResourcePackPacket$Action$SUCCESSFULLY_LOADED || action == NetworkReflections.instance$ServerboundResourcePackPacket$Action$DOWNLOADED;
boolean isTerminal = action != NetworkReflections.instance$ServerboundResourcePackPacket$Action$ACCEPTED && action != NetworkReflections.instance$ServerboundResourcePackPacket$Action$DOWNLOADED;
if (isTerminal && VersionHelper.isOrAbove1_20_2()) {
event.setCancelled(true);
Object packetListener = FastNMS.INSTANCE.method$Connection$getPacketListener(user.connection());
@@ -2330,10 +2336,7 @@ public class PacketConsumers {
try {
// 当客户端发出多次成功包的时候，finish会报错，我们忽略他
NetworkReflections.methodHandle$ServerCommonPacketListener$handleResourcePackResponse.invokeExact(packetListener, packet);
if (action != NetworkReflections.instance$ServerboundResourcePackPacket$Action$ACCEPTED
&& action != NetworkReflections.instance$ServerboundResourcePackPacket$Action$DOWNLOADED) {
CoreReflections.methodHandle$ServerConfigurationPacketListenerImpl$finishCurrentTask.invokeExact(packetListener, CoreReflections.instance$ServerResourcePackConfigurationTask$TYPE);
}
CoreReflections.methodHandle$ServerConfigurationPacketListenerImpl$finishCurrentTask.invokeExact(packetListener, CoreReflections.instance$ServerResourcePackConfigurationTask$TYPE);
} catch (Throwable e) {
Debugger.RESOURCE_PACK.warn(() -> "Cannot finish current task", e);
}