Changed the injected channel name to identify to NoEncryption

V1nc3ntWasTaken · V1nc3ntWasTaken · commit 8ef4223823cf · 2023-02-25T22:38:00.000-06:00
diff --git a/1.19.1/src/main/java/me/doclic/noencryption/PlayerListener.java b/1.19.1/src/main/java/me/doclic/noencryption/PlayerListener.java
@@ -30,9 +30,9 @@ public void write(ChannelHandlerContext channelHandlerContext, Object packet, Ch
         };
 
         if (pipeline.get("packet_handler") == null) {
-            pipeline.addLast(player.getUniqueId().toString(), handler);
+            pipeline.addLast("noencryption_playerlevel", handler);
         } else {
-            pipeline.addBefore("packet_handler", player.getUniqueId().toString(), handler);
+            pipeline.addBefore("packet_handler", "noencryption_playerlevel", handler);
         }
 
         if (ConfigurationHandler.getLoginProtectionMessage() != null) {
@@ -46,6 +46,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object packet, Ch
     public void onPlayerQuit (PlayerQuitEvent e) {
         final Player player = e.getPlayer();
         final Channel channel = Compatibility.COMPATIBLE_PLAYER.getChannel(player);
-        channel.eventLoop().submit(() -> channel.pipeline().remove(player.getUniqueId().toString()));
+        channel.eventLoop().submit(() -> channel.pipeline().remove("noencryption_playerlevel"));
     }
 }
diff --git a/1.19.2/src/main/java/me/doclic/noencryption/PlayerListener.java b/1.19.2/src/main/java/me/doclic/noencryption/PlayerListener.java
@@ -30,9 +30,9 @@ public void write(ChannelHandlerContext channelHandlerContext, Object packet, Ch
         };
 
         if (pipeline.get("packet_handler") == null) {
-            pipeline.addLast(player.getUniqueId().toString(), handler);
+            pipeline.addLast("noencryption_playerlevel", handler);
         } else {
-            pipeline.addBefore("packet_handler", player.getUniqueId().toString(), handler);
+            pipeline.addBefore("packet_handler", "noencryption_playerlevel", handler);
         }
 
         if (ConfigurationHandler.getLoginProtectionMessage() != null) {
@@ -46,6 +46,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object packet, Ch
     public void onPlayerQuit (PlayerQuitEvent e) {
         final Player player = e.getPlayer();
         final Channel channel = Compatibility.COMPATIBLE_PLAYER.getChannel(player);
-        channel.eventLoop().submit(() -> channel.pipeline().remove(player.getUniqueId().toString()));
+        channel.eventLoop().submit(() -> channel.pipeline().remove("noencryption_playerlevel"));
     }
 }
diff --git a/1.19.3/src/main/java/me/doclic/noencryption/PlayerListener.java b/1.19.3/src/main/java/me/doclic/noencryption/PlayerListener.java
@@ -19,7 +19,7 @@ public static void startConnectionListenTimer() {
                 Channel channel = connection.channel;
                 ChannelPipeline pipeline = channel.pipeline();
 
-                if (pipeline.get("noencryption") == null) {
+                if (pipeline.get("noencryption_serverlevel") == null) {
                     final ChannelDuplexHandler handler = new ChannelDuplexHandler() {
                         @Override
                         public void channelRead(ChannelHandlerContext channelHandlerContext, Object packet) throws Exception {
@@ -43,9 +43,9 @@ public void handleConnectionChannel(Object packet) {
                     };
 
                     if (pipeline.get("packet_handler") == null) {
-                        pipeline.addLast("noencryption", handler);
+                        pipeline.addLast("noencryption_serverlevel", handler);
                     } else {
-                        pipeline.addBefore("packet_handler", "noencryption", handler);
+                        pipeline.addBefore("packet_handler", "noencryption_serverlevel", handler);
                     }
                 }
             });
@@ -54,7 +54,7 @@ public void handleConnectionChannel(Object packet) {
         NoEncryption.testerTask = Bukkit.getScheduler().runTaskTimerAsynchronously(NoEncryption.plugin(), () -> {
             NoEncryption.serverChannels.forEach((uuid, channel) -> {
                 if (Bukkit.getPlayer(uuid) == null) {
-                    channel.eventLoop().submit(() -> channel.pipeline().remove("noencryption"));
+                    channel.eventLoop().submit(() -> channel.pipeline().remove("noencryption_serverlevel"));
                     NoEncryption.serverChannels.remove(uuid);
                 }
             });
@@ -85,9 +85,9 @@ public void write(ChannelHandlerContext channelHandlerContext, Object packet, Ch
         };
 
         if (pipeline.get("packet_handler") == null) {
-            pipeline.addLast(player.getUniqueId().toString(), handler);
+            pipeline.addLast("noencryption_playerlevel", handler);
         } else {
-            pipeline.addBefore("packet_handler", player.getUniqueId().toString(), handler);
+            pipeline.addBefore("packet_handler", "noencryption_playerlevel", handler);
         }
 
         if (ConfigurationHandler.getLoginProtectionMessage() != null) {
@@ -101,10 +101,10 @@ public void write(ChannelHandlerContext channelHandlerContext, Object packet, Ch
     public void onPlayerQuit (PlayerQuitEvent e) {
         final Player player = e.getPlayer();
         final Channel channel = Compatibility.COMPATIBLE_PLAYER.getChannel(player);
-        channel.eventLoop().submit(() -> channel.pipeline().remove(player.getUniqueId().toString()));
+        channel.eventLoop().submit(() -> channel.pipeline().remove("noencryption_playerlevel"));
 
         Channel serverChannel = NoEncryption.serverChannels.get(player.getUniqueId());
-        serverChannel.eventLoop().submit(() -> serverChannel.pipeline().remove("noencryption"));
+        serverChannel.eventLoop().submit(() -> serverChannel.pipeline().remove("noencryption_serverlevel"));
         NoEncryption.serverChannels.remove(player.getUniqueId());
     }
 }
diff --git a/1.19/src/main/java/me/doclic/noencryption/PlayerListener.java b/1.19/src/main/java/me/doclic/noencryption/PlayerListener.java
@@ -30,9 +30,9 @@ public void write(ChannelHandlerContext channelHandlerContext, Object packet, Ch
         };
 
         if (pipeline.get("packet_handler") == null) {
-            pipeline.addLast(player.getUniqueId().toString(), handler);
+            pipeline.addLast("noencryption_playerlevel", handler);
         } else {
-            pipeline.addBefore("packet_handler", player.getUniqueId().toString(), handler);
+            pipeline.addBefore("packet_handler", "noencryption_playerlevel", handler);
         }
 
         if (ConfigurationHandler.getLoginProtectionMessage() != null) {
@@ -46,6 +46,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object packet, Ch
     public void onPlayerQuit (PlayerQuitEvent e) {
         final Player player = e.getPlayer();
         final Channel channel = Compatibility.COMPATIBLE_PLAYER.getChannel(player);
-        channel.eventLoop().submit(() -> channel.pipeline().remove(player.getUniqueId().toString()));
+        channel.eventLoop().submit(() -> channel.pipeline().remove("noencryption_playerlevel"));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@ public void write(ChannelHandlerContext channelHandlerContext, Object packet, Ch`
`30`	`30`	`};`
`31`	`31`
`32`	`32`	`if (pipeline.get("packet_handler") == null) {`
`33`		`- pipeline.addLast(player.getUniqueId().toString(), handler);`
	`33`	`+ pipeline.addLast("noencryption_playerlevel", handler);`
`34`	`34`	`} else {`
`35`		`- pipeline.addBefore("packet_handler", player.getUniqueId().toString(), handler);`
	`35`	`+ pipeline.addBefore("packet_handler", "noencryption_playerlevel", handler);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`if (ConfigurationHandler.getLoginProtectionMessage() != null) {`
`@@ -46,6 +46,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object packet, Ch`
`46`	`46`	`public void onPlayerQuit (PlayerQuitEvent e) {`
`47`	`47`	`final Player player = e.getPlayer();`
`48`	`48`	`final Channel channel = Compatibility.COMPATIBLE_PLAYER.getChannel(player);`
`49`		`- channel.eventLoop().submit(() -> channel.pipeline().remove(player.getUniqueId().toString()));`
	`49`	`+ channel.eventLoop().submit(() -> channel.pipeline().remove("noencryption_playerlevel"));`
`50`	`50`	`}`
`51`	`51`	`}`