|
26 | 26 | public class PacketListener implements Listener { |
27 | 27 |
|
28 | 28 | private static final String MC_PACKET_HANDLER_NAME = "packet_handler"; |
29 | | - private static final String INVUI_PACKET_HANDLER_NAME = "invui_packet_handler"; |
30 | | - |
31 | 29 | private static final PacketListener INSTANCE = new PacketListener(); |
32 | 30 |
|
| 31 | + private final String invuiPacketHandlerName; |
33 | 32 | private final Map<UUID, PacketHandler> packetHandlers = new HashMap<>(); |
34 | 33 |
|
35 | 34 | private PacketListener() { |
| 35 | + invuiPacketHandlerName = "invui_packet_handler_" + InvUI.getInstance().getPlugin().getName(); |
36 | 36 | Bukkit.getOnlinePlayers().forEach(this::injectChannelHandler); |
37 | 37 | Bukkit.getPluginManager().registerEvents(this, InvUI.getInstance().getPlugin()); |
38 | 38 | InvUI.getInstance().addDisableHandler(() -> Bukkit.getOnlinePlayers().forEach(this::removeChannelHandler)); |
@@ -93,13 +93,13 @@ private void injectChannelHandler(Player player) { |
93 | 93 | var channel = ((CraftPlayer) player).getHandle().connection.connection.channel; |
94 | 94 | var packetHandler = new PacketHandler(channel); |
95 | 95 | packetHandlers.put(player.getUniqueId(), packetHandler); |
96 | | - channel.pipeline().addBefore(MC_PACKET_HANDLER_NAME, INVUI_PACKET_HANDLER_NAME, packetHandler); |
| 96 | + channel.pipeline().addBefore(MC_PACKET_HANDLER_NAME, invuiPacketHandlerName, packetHandler); |
97 | 97 | } |
98 | 98 |
|
99 | 99 | private void removeChannelHandler(Player player) { |
100 | 100 | packetHandlers.remove(player.getUniqueId()); |
101 | 101 | var channel = ((CraftPlayer) player).getHandle().connection.connection.channel; |
102 | | - channel.pipeline().remove(INVUI_PACKET_HANDLER_NAME); |
| 102 | + channel.pipeline().remove(invuiPacketHandlerName); |
103 | 103 | } |
104 | 104 |
|
105 | 105 | private static class PacketHandler extends ChannelDuplexHandler { |
|
0 commit comments