From d8a220bcc2411b271862eca74a08b8a0865b4489 Mon Sep 17 00:00:00 2001
From: mohammed jasem alaajel <xrambad@gmail.com>
Date: Fri, 15 Jul 2022 01:35:54 +0400
Subject: [PATCH] fix bungeecord incorrect channel names

---
 .../minecraft/redisbungee/RedisBungeeBungeePlugin.java      | 1 +
 .../minecraft/redisbungee/RedisBungeeListener.java          | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeBungeePlugin.java b/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeBungeePlugin.java
index 31c7c6b..5ca671d 100644
--- a/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeBungeePlugin.java
+++ b/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeBungeePlugin.java
@@ -463,6 +463,7 @@ public class RedisBungeeBungeePlugin extends Plugin implements RedisBungeePlugin
             }, 0, 1, TimeUnit.MINUTES);
         }
         getProxy().registerChannel("legacy:redisbungee");
+        getProxy().registerChannel("redisbungee:redisbungee");
         getProxy().registerChannel("RedisBungee");
         // register commands
         if (configuration.doOverrideBungeeCommands()) {
diff --git a/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeListener.java b/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeListener.java
index 245e851..edd60ab 100644
--- a/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeListener.java
+++ b/RedisBungee-Bungee/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeListener.java
@@ -146,7 +146,11 @@ public class RedisBungeeListener extends AbstractRedisBungeeListener<LoginEvent,
     @SuppressWarnings("UnstableApiUsage")
     @EventHandler
     public void onPluginMessage(PluginMessageEvent event) {
-        if ((event.getTag().equals("legacy:redisbungee") || event.getTag().equals("RedisBungee")) && event.getSender() instanceof Server) {
+        // this somehow has channel called RedisBungee not sure how it got here, keep it as it might break functionality
+        if (
+                (event.getTag().equals("legacy:redisbungee") || event.getTag().equals("redisbungee:redisbungee")
+                        || event.getTag().equals("RedisBungee")) && event.getSender() instanceof Server
+        ) {
             final String currentChannel = event.getTag();
             final byte[] data = Arrays.copyOf(event.getData(), event.getData().length);
             plugin.executeAsync(() -> {