0.12.6

fixes null network id

.github/workflows/gradle.yml

@@ -5,9 +5,9 @@ name: RedisBungee Build
 
 on:
   push:
-    branches: [ main ]
+    branches: [ stable, develop ]
   pull_request:
-    branches: [ main ]
+    branches: [ stable, develop ]
 
 jobs:
   build:
@@ -24,19 +24,19 @@ jobs:
     - name: Build with gradle
       run: ./gradlew shadowJar
     - name: Upload Bungee
-      uses: actions/upload-artifact@v2.2.3
+      uses: actions/upload-artifact@v4.4.0
       with:
      # Artifact name
        name: RedisBungee-Bungee
      # Destination path
        path: proxies/bungeecord/build/libs/*
     - name: Upload Velocity
-      uses: actions/upload-artifact@v2.2.3
+      uses: actions/upload-artifact@v4.4.0
       with:
         name: RedisBungee-Velocity
         path: proxies/velocity/build/libs/*
     - name: Upload API
-      uses: actions/upload-artifact@v2.2.3
+      uses: actions/upload-artifact@v4.4.0
       with:
         name: RedisBungee-API
         path: api/build/libs/*

api/src/main/java/com/imaginarycode/minecraft/redisbungee/api/PlayerDataManager.java

@@ -28,10 +28,7 @@ import redis.clients.jedis.Response;
 import redis.clients.jedis.UnifiedJedis;
 
 import java.net.InetAddress;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 public abstract class PlayerDataManager<P, LE, DE, PS extends IPubSubMessageEvent, SC extends IPlayerChangedServerNetworkEvent, NJE extends IPlayerLeftNetworkEvent, CE> {
@@ -57,18 +54,18 @@ public abstract class PlayerDataManager<P, LE, DE, PS extends IPubSubMessageEven
 
     // handle network wide
     // server change
-    public abstract void onPlayerChangedServerNetworkEvent(SC event);
+    //l public abstract void onPlayerChangedServerNetworkEvent(SC event);
 
-    public abstract void onNetworkPlayerQuit(NJE event);
+    // public abstract void onNetworkPlayerQuit(NJE event);
 
     // local events
-    public abstract void onPubSubMessageEvent(PS event);
+    //public abstract void onPubSubMessageEvent(PS event);
 
-    public abstract void onServerConnectedEvent(CE event);
+    //public abstract void onServerConnectedEvent(CE event);
 
-    public abstract void onLoginEvent(LE event);
+    //public abstract void onLoginEvent(LE event);
 
-    public abstract void onDisconnectEvent(DE event);
+    //public abstract void onDisconnectEvent(DE event);
 
     protected void handleNetworkPlayerServerChange(IPlayerChangedServerNetworkEvent event) {
         this.serverCache.invalidate(event.getUuid());
@@ -248,10 +245,17 @@ 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) {
-                        responses.put(uuid, pipeline.hget("redis-bungee::" + networkId + "::player::" + uuid + "::data", "server"));
+                        Optional.ofNullable(pipeline.hget("redis-bungee::" + networkId + "::player::" + uuid + "::data", "server")).ifPresent(stringResponse -> {
+                            responses.put(uuid, stringResponse);
+                        });
                     }
                     pipeline.sync();
-                    responses.forEach((uuid, response) -> builder.put(response.get(), uuid));
+                    responses.forEach((uuid, response) -> {
+                        String key = response.get();
+                        if (key == null) return;
+
+                        builder.put(key, uuid);
+                    });
                     return builder.build();
                 }
 
@@ -259,10 +263,16 @@ 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) {
-                        responses.put(uuid, pipeline.hget("redis-bungee::" + networkId + "::player::" + uuid + "::data", "server"));
+                        Optional.ofNullable(pipeline.hget("redis-bungee::" + networkId + "::player::" + uuid + "::data", "server")).ifPresent(stringResponse -> {
+                            responses.put(uuid, stringResponse);
+                        });
                     }
                     pipeline.sync();
-                    responses.forEach((uuid, response) -> builder.put(response.get(), uuid));
+                    responses.forEach((uuid, response) -> {
+                        String key = response.get();
+                        if (key == null) return;
+                        builder.put(key, uuid);
+                    });
                     return builder.build();
                 }
             }.call();

api/src/main/java/com/imaginarycode/minecraft/redisbungee/api/ProxyDataManager.java

@@ -66,9 +66,9 @@ public abstract class ProxyDataManager implements Runnable {
         this.plugin = plugin;
         this.proxyId = this.plugin.configuration().getProxyId();
         this.unifiedJedis = plugin.getSummoner().obtainResource();
-        this.destroyProxyMembers();
         this.networkId = plugin.configuration().networkId();
         this.STREAM_ID = "network-" + this.networkId + "-redisbungee-stream";
+        this.destroyProxyMembers();
     }
 
     public abstract Set<UUID> getLocalOnlineUUIDs();
@@ -82,6 +82,13 @@ public abstract class ProxyDataManager implements Runnable {
         return getProxyMembers(proxyId);
     }
 
+    // this skip checking if proxy is and its package private
+    // due proxy shutdown shenanigans
+    public boolean isPlayerTrulyOnProxy(String proxyId, UUID uuid) {
+        return unifiedJedis.sismember("redisbungee::" + this.networkId + "::proxies::" + proxyId + "::online-players", uuid.toString());
+    }
+
+
     public List<String> proxiesIds() {
         return Collections.list(this.heartbeats.keys());
     }

gradle.properties

@@ -1,2 +1,2 @@
 group=com.imaginarycode.minecraft
-version=0.12.4
+version=0.12.6

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

proxies/bungeecord/build.gradle.kts

@@ -60,6 +60,8 @@ tasks {
         relocate("com.github.benmanes.caffeine", "com.imaginarycode.minecraft.redisbungee.internal.caffeine")
         // acf shade
         relocate("co.aikar.commands", "com.imaginarycode.minecraft.redisbungee.internal.acf.commands")
+        // adventure :/
+        relocate("net.kyori", "com.imaginarycode.minecraft.redisbungee.internal.net.kyori")
 
     }
 

proxies/bungeecord/src/main/java/com/imaginarycode/minecraft/redisbungee/BungeePlayerDataManager.java

@@ -15,7 +15,6 @@ import com.imaginarycode.minecraft.redisbungee.api.RedisBungeePlugin;
 import com.imaginarycode.minecraft.redisbungee.events.PlayerChangedServerNetworkEvent;
 import com.imaginarycode.minecraft.redisbungee.events.PlayerLeftNetworkEvent;
 import com.imaginarycode.minecraft.redisbungee.events.PubSubMessageEvent;
-import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.LoginEvent;
@@ -35,25 +34,21 @@ public class BungeePlayerDataManager extends PlayerDataManager<ProxiedPlayer, Po
         super(plugin);
     }
 
-    @Override
     @EventHandler
     public void onPlayerChangedServerNetworkEvent(PlayerChangedServerNetworkEvent event) {
         super.handleNetworkPlayerServerChange(event);
     }
 
-    @Override
     @EventHandler
     public void onNetworkPlayerQuit(PlayerLeftNetworkEvent event) {
         super.handleNetworkPlayerQuit(event);
     }
 
-    @Override
     @EventHandler
     public void onPubSubMessageEvent(PubSubMessageEvent event) {
         super.handlePubSubMessageEvent(event);
     }
 
-    @Override
     @EventHandler
     public void onServerConnectedEvent(ServerConnectedEvent event) {
         final String currentServer = event.getServer().getInfo().getName();
@@ -66,14 +61,21 @@ public class BungeePlayerDataManager extends PlayerDataManager<ProxiedPlayer, Po
         event.registerIntent((Plugin) plugin);
         // check if online
         if (getLastOnline(event.getConnection().getUniqueId()) == 0) {
-            if (plugin.configuration().kickWhenOnline()) {
-                kickPlayer(event.getConnection().getUniqueId(), plugin.langConfiguration().messages().loggedInFromOtherLocation());
-                // wait 3 seconds before releasing the event
-                plugin.executeAsyncAfter(() -> event.completeIntent((Plugin) plugin), TimeUnit.SECONDS, 3);
-            } else {
-                event.setCancelled(true);
-                event.setCancelReason(BungeeComponentSerializer.get().serialize(plugin.langConfiguration().messages().alreadyLoggedIn()));
+            // because something can go wrong and proxy somehow does not update player data correctly on shutdown
+            // we have to check proxy if it has the player
+            String proxyId = getProxyFor(event.getConnection().getUniqueId());
+            if (proxyId == null || !plugin.proxyDataManager().isPlayerTrulyOnProxy(proxyId, event.getConnection().getUniqueId())) {
                 event.completeIntent((Plugin) plugin);
+            } else {
+                if (plugin.configuration().kickWhenOnline()) {
+                    kickPlayer(event.getConnection().getUniqueId(), plugin.langConfiguration().messages().loggedInFromOtherLocation());
+                    // wait 3 seconds before releasing the event
+                    plugin.executeAsyncAfter(() -> event.completeIntent((Plugin) plugin), TimeUnit.SECONDS, 3);
+                } else {
+                    event.setCancelled(true);
+                    event.setCancelReason(BungeeComponentSerializer.get().serialize(plugin.langConfiguration().messages().alreadyLoggedIn()));
+                    event.completeIntent((Plugin) plugin);
+                }
             }
         } else {
             event.completeIntent((Plugin) plugin);
@@ -81,13 +83,11 @@ public class BungeePlayerDataManager extends PlayerDataManager<ProxiedPlayer, Po
 
     }
 
-    @Override
     @EventHandler
     public void onLoginEvent(PostLoginEvent event) {
         super.addPlayer(event.getPlayer().getUniqueId(), event.getPlayer().getName(), event.getPlayer().getAddress().getAddress());
     }
 
-    @Override
     @EventHandler
     public void onDisconnectEvent(PlayerDisconnectEvent event) {
         super.removePlayer(event.getPlayer().getUniqueId());

proxies/velocity/src/main/java/com/imaginarycode/minecraft/redisbungee/VelocityPlayerDataManager.java

@@ -33,25 +33,21 @@ public class VelocityPlayerDataManager extends PlayerDataManager<Player, PostLog
         super(plugin);
     }
 
-    @Override
     @Subscribe
     public void onPlayerChangedServerNetworkEvent(PlayerChangedServerNetworkEvent event) {
         handleNetworkPlayerServerChange(event);
     }
 
-    @Override
     @Subscribe
     public void onNetworkPlayerQuit(PlayerLeftNetworkEvent event) {
         handleNetworkPlayerQuit(event);
     }
 
-    @Override
     @Subscribe
     public void onPubSubMessageEvent(PubSubMessageEvent event) {
         handlePubSubMessageEvent(event);
     }
 
-    @Override
     @Subscribe
     public void onServerConnectedEvent(ServerConnectedEvent event) {
         final String currentServer = event.getServer().getServerInfo().getName();
@@ -68,26 +64,31 @@ public class VelocityPlayerDataManager extends PlayerDataManager<Player, PostLog
     public void onLoginEvent(LoginEvent event, Continuation continuation) {
         // check if online
         if (getLastOnline(event.getPlayer().getUniqueId()) == 0) {
-            if (plugin.configuration().kickWhenOnline()) {
-                kickPlayer(event.getPlayer().getUniqueId(), plugin.langConfiguration().messages().loggedInFromOtherLocation());
-                // wait 3 seconds before releasing the event
-                plugin.executeAsyncAfter(continuation::resume, TimeUnit.SECONDS, 3);
-            } else {
-                event.setResult(ResultedEvent.ComponentResult.denied(plugin.langConfiguration().messages().alreadyLoggedIn()));
+            // because something can go wrong and proxy somehow does not update player data correctly on shutdown
+            // we have to check proxy if it has the player
+            String proxyId = getProxyFor(event.getPlayer().getUniqueId());
+            if (proxyId == null || !plugin.proxyDataManager().isPlayerTrulyOnProxy(proxyId, event.getPlayer().getUniqueId())) {
                 continuation.resume();
+            } else {
+                if (plugin.configuration().kickWhenOnline()) {
+                    kickPlayer(event.getPlayer().getUniqueId(), plugin.langConfiguration().messages().loggedInFromOtherLocation());
+                    // wait 3 seconds before releasing the event
+                    plugin.executeAsyncAfter(continuation::resume, TimeUnit.SECONDS, 3);
+                } else {
+                    event.setResult(ResultedEvent.ComponentResult.denied(plugin.langConfiguration().messages().alreadyLoggedIn()));
+                    continuation.resume();
+                }
             }
         } else {
             continuation.resume();
         }
     }
 
-    @Override
     @Subscribe
     public void onLoginEvent(PostLoginEvent event) {
         addPlayer(event.getPlayer().getUniqueId(), event.getPlayer().getUsername(), event.getPlayer().getRemoteAddress().getAddress());
     }
 
-    @Override
     @Subscribe
     public void onDisconnectEvent(DisconnectEvent event) {
         if (event.getLoginStatus() == DisconnectEvent.LoginStatus.SUCCESSFUL_LOGIN || event.getLoginStatus() == DisconnectEvent.LoginStatus.PRE_SERVER_JOIN) {

settings.gradle.kts

@@ -56,7 +56,7 @@ dependencyResolutionManagement {
         val caffeineVersion = "3.1.8"
         val adventureVersion = "4.16.0"
         val acf = "0.5.1-SNAPSHOT"
-        val bungeecordApiVersion = "1.20-R0.1-SNAPSHOT"
+        val bungeecordApiVersion = "1.21-R0.1-SNAPSHOT"
         val velocityVersion = "3.3.0-SNAPSHOT";