From da710e5af80dc01a7df407bd9bdecd2b8fd0bc9c Mon Sep 17 00:00:00 2001
From: MiniDay <372403923@qq.com>
Date: Mon, 20 Nov 2023 17:03:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=B6=E5=88=B0=E9=A2=91=E9=81=93?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=90=8E=E5=85=88=E7=A7=BB=E9=99=A4=E5=89=8D?=
 =?UTF-8?q?=E7=BC=80=E5=86=8D=E8=A7=A6=E5=8F=91=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hamster3/mc/plugin/ball/bukkit/api/BallBukkitAPI.java   | 2 +-
 .../mc/plugin/core/bungee/api/BallBungeeCordAPI.java        | 2 +-
 .../java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java | 6 +++---
 .../mc/plugin/ball/common/listener/BallRedisListener.java   | 3 +++
 build.gradle.kts                                            | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/api/BallBukkitAPI.java b/ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/api/BallBukkitAPI.java
index 5b1704a..8911bf9 100644
--- a/ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/api/BallBukkitAPI.java
+++ b/ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/api/BallBukkitAPI.java
@@ -59,7 +59,7 @@ public class BallBukkitAPI extends BallAPI {
         BallConfig ballConfig = new BallConfig(
                 config.getBoolean("debug", false),
                 RedisClient.create(config.getString("redis-url")),
-                config.getString("channel-prefix", ""),
+                config.getString("channel-prefix", "") + ":",
                 config.getBoolean("game-server-update-player-info", false),
                 serverInfo,
                 datasource
diff --git a/ball-bungee/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/BallBungeeCordAPI.java b/ball-bungee/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/BallBungeeCordAPI.java
index 3dc362e..aeeeb8e 100644
--- a/ball-bungee/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/BallBungeeCordAPI.java
+++ b/ball-bungee/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/BallBungeeCordAPI.java
@@ -56,7 +56,7 @@ public class BallBungeeCordAPI extends BallAPI {
         BallConfig ballConfig = new BallConfig(
                 config.getBoolean("debug", false),
                 RedisClient.create(config.getString("redis-url")),
-                config.getString("channel-prefix", ""),
+                config.getString("channel-prefix", "") + ":",
                 config.getBoolean("game-server-update-player-info", false),
                 serverInfo,
                 datasource
diff --git a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java
index 3eed97b..e4a95b3 100644
--- a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java
+++ b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java
@@ -448,7 +448,7 @@ public abstract class BallAPI {
      */
     public void sendBallMessage(@NotNull String channel, @NotNull BallMessage message, boolean prefix, boolean block) {
         if (prefix) {
-            channel = ballConfig.getChannelPrefix() + ":" + channel;
+            channel = ballConfig.getChannelPrefix() + channel;
         }
         if (block) {
             pubConnection.sync().publish(channel, message);
@@ -466,7 +466,7 @@ public abstract class BallAPI {
 
     public void subscribe(@NotNull String... channel) {
         for (int i = 0; i < channel.length; i++) {
-            channel[i] = ballConfig.getChannelPrefix() + ":" + channel[i];
+            channel[i] = ballConfig.getChannelPrefix() + channel[i];
         }
         subConnection.sync().subscribe(channel);
     }
@@ -477,7 +477,7 @@ public abstract class BallAPI {
 
     public void unsubscribe(@NotNull String... channel) {
         for (int i = 0; i < channel.length; i++) {
-            channel[i] = ballConfig.getChannelPrefix() + ":" + channel[i];
+            channel[i] = ballConfig.getChannelPrefix() + channel[i];
         }
         subConnection.sync().unsubscribe(channel);
     }
diff --git a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallRedisListener.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallRedisListener.java
index 4ccfae0..aa0037c 100644
--- a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallRedisListener.java
+++ b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallRedisListener.java
@@ -19,6 +19,9 @@ public class BallRedisListener implements RedisPubSubListener<String, BallMessag
 
     @Override
     public void message(String channel, BallMessage ballMessage) {
+        if (channel.startsWith(BallAPI.getInstance().getBallConfig().getChannelPrefix())) {
+            channel = channel.substring(BallAPI.getInstance().getBallConfig().getChannelPrefix().length());
+        }
         BallAPI api = BallAPI.getInstance();
         if (ballMessage.getReceiverType() != null && ballMessage.getReceiverType() != api.getLocalServerInfo().getType()) {
             return;
diff --git a/build.gradle.kts b/build.gradle.kts
index 5a56fa9..183862f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "cn.hamster3.mc.plugin"
-version = "1.4.1"
+version = "1.4.2"
 
 subprojects {
     apply {