From f64756bb2ceb36a6e1d2111d352ce25383953a11 Mon Sep 17 00:00:00 2001 From: Junhyung Park Date: Wed, 12 Mar 2025 13:52:15 +0900 Subject: [PATCH 1/2] Remove unused channelInactive method from PacketHandler --- .../kr/hqservice/framework/nms/handler/PacketHandler.kt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/bukkit-nms/src/main/kotlin/kr/hqservice/framework/nms/handler/PacketHandler.kt b/modules/bukkit-nms/src/main/kotlin/kr/hqservice/framework/nms/handler/PacketHandler.kt index 5b1c513d..35df6c09 100644 --- a/modules/bukkit-nms/src/main/kotlin/kr/hqservice/framework/nms/handler/PacketHandler.kt +++ b/modules/bukkit-nms/src/main/kotlin/kr/hqservice/framework/nms/handler/PacketHandler.kt @@ -54,10 +54,4 @@ class PacketHandler( super.channelRead(context, message) } - override fun channelInactive(ctx: ChannelHandlerContext) { - if (ctx.pipeline().get("hq_injector") != null) { - virtualHandlerRegistry.cleanup(uniqueId) - ctx.pipeline().remove("hq_injector") - } - } } \ No newline at end of file From d38572232220009dbe3a9827172464ef25ae38d1 Mon Sep 17 00:00:00 2001 From: Junhyung Park Date: Wed, 12 Mar 2025 13:54:24 +0900 Subject: [PATCH 2/2] Replace hardcoded packet handler string with constant --- .../nms/v20_6/service/netty/NmsNettyInjectServiceImpl.kt | 3 ++- .../nms/v21/service/netty/NmsNettyInjectServiceImpl.kt | 3 ++- .../nms/legacy/service/netty/LegacyNmsNettyInjectService.kt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nms/V20_6/src/main/kotlin/kr/hqservice/framework/nms/v20_6/service/netty/NmsNettyInjectServiceImpl.kt b/nms/V20_6/src/main/kotlin/kr/hqservice/framework/nms/v20_6/service/netty/NmsNettyInjectServiceImpl.kt index ddd02868..90eae543 100644 --- a/nms/V20_6/src/main/kotlin/kr/hqservice/framework/nms/v20_6/service/netty/NmsNettyInjectServiceImpl.kt +++ b/nms/V20_6/src/main/kotlin/kr/hqservice/framework/nms/v20_6/service/netty/NmsNettyInjectServiceImpl.kt @@ -5,6 +5,7 @@ import kr.hqservice.framework.nms.handler.PacketHandler import kr.hqservice.framework.nms.util.NmsNettyInjectService import kr.hqservice.framework.nms.v20_6.wrapper.reflect.NmsReflectionWrapperImpl import kr.hqservice.framework.nms.virtual.registry.VirtualHandlerRegistry +import net.minecraft.network.HandlerNames import org.bukkit.Server import org.bukkit.entity.Player import org.bukkit.plugin.Plugin @@ -43,7 +44,7 @@ class NmsNettyInjectServiceImpl( if (pipeline.get("hq_packet_handler") == null) { pipeline.addBefore( - "packet_handler", + HandlerNames.PACKET_HANDLER, "hq_packet_handler", PacketHandler(player, plugin, virtualHandlerRegistry) ) diff --git a/nms/V21/src/main/kotlin/kr/hqservice/framework/nms/v21/service/netty/NmsNettyInjectServiceImpl.kt b/nms/V21/src/main/kotlin/kr/hqservice/framework/nms/v21/service/netty/NmsNettyInjectServiceImpl.kt index e94cdaa3..a4abe343 100644 --- a/nms/V21/src/main/kotlin/kr/hqservice/framework/nms/v21/service/netty/NmsNettyInjectServiceImpl.kt +++ b/nms/V21/src/main/kotlin/kr/hqservice/framework/nms/v21/service/netty/NmsNettyInjectServiceImpl.kt @@ -5,6 +5,7 @@ import kr.hqservice.framework.nms.handler.PacketHandler import kr.hqservice.framework.nms.util.NmsNettyInjectService import kr.hqservice.framework.nms.v21.wrapper.reflect.NmsReflectionWrapperImpl import kr.hqservice.framework.nms.virtual.registry.VirtualHandlerRegistry +import net.minecraft.network.HandlerNames import org.bukkit.Server import org.bukkit.entity.Player import org.bukkit.plugin.Plugin @@ -43,7 +44,7 @@ class NmsNettyInjectServiceImpl( if (pipeline.get("hq_packet_handler") == null) { pipeline.addBefore( - "packet_handler", + HandlerNames.PACKET_HANDLER, "hq_packet_handler", PacketHandler(player, plugin, virtualHandlerRegistry) ) diff --git a/nms/legacy/src/main/kotlin/kr/hqservice/framework/nms/legacy/service/netty/LegacyNmsNettyInjectService.kt b/nms/legacy/src/main/kotlin/kr/hqservice/framework/nms/legacy/service/netty/LegacyNmsNettyInjectService.kt index b0b49715..8fdb68e3 100644 --- a/nms/legacy/src/main/kotlin/kr/hqservice/framework/nms/legacy/service/netty/LegacyNmsNettyInjectService.kt +++ b/nms/legacy/src/main/kotlin/kr/hqservice/framework/nms/legacy/service/netty/LegacyNmsNettyInjectService.kt @@ -71,7 +71,7 @@ class LegacyNmsNettyInjectService( if (pipeline.get("hq_packet_handler") == null) { pipeline.addBefore( - "packet_handler", + "packet_handler", // TODO: Change the hardcoded value to a constant "hq_packet_handler", PacketHandler(player, plugin, virtualHandlerRegistry) )