Skip to content

Refactor/netty polishing #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vjh0107 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Refactor/netty polishing #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f64756b
Remove unused channelInactive method from PacketHandler
vjh0107 Mar 12, 2025
d385722
Replace hardcoded packet handler string with constant
vjh0107 Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions modules/bukkit-nms/src/main/kotlin/kr/hqservice/framework/nms/handler/PacketHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
}
3 changes: 2 additions & 1 deletion ...c/main/kotlin/kr/hqservice/framework/nms/v20_6/service/netty/NmsNettyInjectServiceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
)
Expand Down
3 changes: 2 additions & 1 deletion ...src/main/kotlin/kr/hqservice/framework/nms/v21/service/netty/NmsNettyInjectServiceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
)
Expand Down
2 changes: 1 addition & 1 deletion ...ain/kotlin/kr/hqservice/framework/nms/legacy/service/netty/LegacyNmsNettyInjectService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
Expand Down