From 0903a028df605c1da3111f462a9ffefe68e8fdd3 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier GOIN <60008676+Koora7334@users.noreply.github.com>
Date: Thu, 20 Feb 2025 17:17:23 +0100
Subject: [PATCH] fix channel name

Maintain the same name in the Redis database as in the ProxyDataManager.
---
 .../redisbungee/api/PlayerDataManager.java    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/api/src/main/java/com/imaginarycode/minecraft/redisbungee/api/PlayerDataManager.java b/api/src/main/java/com/imaginarycode/minecraft/redisbungee/api/PlayerDataManager.java
index 653ffcc..3e30320 100644
--- a/api/src/main/java/com/imaginarycode/minecraft/redisbungee/api/PlayerDataManager.java
+++ b/api/src/main/java/com/imaginarycode/minecraft/redisbungee/api/PlayerDataManager.java
@@ -157,7 +157,7 @@ public abstract class PlayerDataManager<P, LE, DE, PS extends IPubSubMessageEven
         Map<String, String> data = new HashMap<>();
         data.put("server", server);
         data.put("last-server", server);
-        unifiedJedis.hset("redis-bungee::" + this.networkId + "::player::" + uuid + "::data", data);
+        unifiedJedis.hset("redisbungee::" + this.networkId + "::player::" + uuid + "::data", data);
     }
 
     protected void addPlayer(final UUID uuid, final String name, final InetAddress inetAddress) {
@@ -165,7 +165,7 @@ public abstract class PlayerDataManager<P, LE, DE, PS extends IPubSubMessageEven
         redisData.put("last-online", String.valueOf(0));
         redisData.put("proxy", this.proxyId);
         redisData.put("ip", inetAddress.getHostAddress());
-        unifiedJedis.hset("redis-bungee::" + this.networkId + "::player::" + uuid + "::data", redisData);
+        unifiedJedis.hset("redisbungee::" + this.networkId + "::player::" + uuid + "::data", redisData);
         plugin.getUuidTranslator().persistInfo(name, uuid, this.unifiedJedis);
         JSONObject data = new JSONObject();
         data.put("proxy", this.proxyId);
@@ -176,8 +176,8 @@ public abstract class PlayerDataManager<P, LE, DE, PS extends IPubSubMessageEven
     }
 
     protected void removePlayer(UUID uuid) {
-        unifiedJedis.hset("redis-bungee::" + this.networkId + "::player::" + uuid + "::data", "last-online", String.valueOf(System.currentTimeMillis()));
-        unifiedJedis.hdel("redis-bungee::" + this.networkId + "::player::" + uuid + "::data", "server", "proxy", "ip");
+        unifiedJedis.hset("redisbungee::" + this.networkId + "::player::" + uuid + "::data", "last-online", String.valueOf(System.currentTimeMillis()));
+        unifiedJedis.hdel("redisbungee::" + this.networkId + "::player::" + uuid + "::data", "server", "proxy", "ip");
         JSONObject data = new JSONObject();
         data.put("proxy", this.proxyId);
         data.put("uuid", uuid);
@@ -188,25 +188,25 @@ public abstract class PlayerDataManager<P, LE, DE, PS extends IPubSubMessageEven
 
 
     protected String getProxyFromRedis(UUID uuid) {
-        return unifiedJedis.hget("redis-bungee::" + this.networkId + "::player::" + uuid + "::data", "proxy");
+        return unifiedJedis.hget("redisbungee::" + this.networkId + "::player::" + uuid + "::data", "proxy");
     }
 
     protected String getServerFromRedis(UUID uuid) {
-        return unifiedJedis.hget("redis-bungee::" + this.networkId + "::player::" + uuid + "::data", "server");
+        return unifiedJedis.hget("redisbungee::" + this.networkId + "::player::" + uuid + "::data", "server");
     }
 
     protected String getLastServerFromRedis(UUID uuid) {
-        return unifiedJedis.hget("redis-bungee::" + this.networkId + "::player::" + uuid + "::data", "last-server");
+        return unifiedJedis.hget("redisbungee::" + this.networkId + "::player::" + uuid + "::data", "last-server");
     }
 
     protected InetAddress getIpAddressFromRedis(UUID uuid) {
-        String ip = unifiedJedis.hget("redis-bungee::" + this.networkId + "::player::" + uuid + "::data", "ip");
+        String ip = unifiedJedis.hget("redisbungee::" + this.networkId + "::player::" + uuid + "::data", "ip");
         if (ip == null) return null;
         return InetAddresses.forString(ip);
     }
 
     protected long getLastOnlineFromRedis(UUID uuid) {
-        String unixString = unifiedJedis.hget("redis-bungee::" + this.networkId + "::player::" + uuid + "::data", "last-online");
+        String unixString = unifiedJedis.hget("redisbungee::" + this.networkId + "::player::" + uuid + "::data", "last-online");
         if (unixString == null) return -1;
         return Long.parseLong(unixString);
     }
@@ -245,7 +245,7 @@ public abstract class PlayerDataManager<P, LE, DE, PS extends IPubSubMessageEven
                 public Multimap<String, UUID> doPooledPipeline(Pipeline pipeline) {
                     HashMap<UUID, Response<String>> responses = new HashMap<>();
                     for (UUID uuid : uuids) {
-                        Optional.ofNullable(pipeline.hget("redis-bungee::" + networkId + "::player::" + uuid + "::data", "server")).ifPresent(stringResponse -> {
+                        Optional.ofNullable(pipeline.hget("redisbungee::" + networkId + "::player::" + uuid + "::data", "server")).ifPresent(stringResponse -> {
                             responses.put(uuid, stringResponse);
                         });
                     }
@@ -263,7 +263,7 @@ public abstract class PlayerDataManager<P, LE, DE, PS extends IPubSubMessageEven
                 public Multimap<String, UUID> clusterPipeline(ClusterPipeline pipeline) {
                     HashMap<UUID, Response<String>> responses = new HashMap<>();
                     for (UUID uuid : uuids) {
-                        Optional.ofNullable(pipeline.hget("redis-bungee::" + networkId + "::player::" + uuid + "::data", "server")).ifPresent(stringResponse -> {
+                        Optional.ofNullable(pipeline.hget("redisbungee::" + networkId + "::player::" + uuid + "::data", "server")).ifPresent(stringResponse -> {
                             responses.put(uuid, stringResponse);
                         });
                     }