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: RedisBungee-Bungee/build/libs/*
+       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: RedisBungee-Velocity/build/libs/*
+        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: RedisBungee-API/build/libs/*
+        path: api/build/libs/*

.gitignore

@@ -46,4 +46,4 @@ manifest.mf
 javadoc
 
 # run-server folders
-*/run
+proxies/*/run

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

@@ -224,7 +224,7 @@ public abstract class AbstractRedisBungeeAPI {
      * @since 0.2.5
      * @deprecated to avoid confusion between A server and A proxy see #getProxyId()
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public final String getServerId() {
         return getProxyId();
     }
@@ -248,7 +248,7 @@ public abstract class AbstractRedisBungeeAPI {
      * @since 0.2.5
      * @deprecated to avoid confusion between A server and A proxy see see {@link #getAllProxies()}
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public final List<String> getAllServers() {
         return getAllProxies();
     }
@@ -260,7 +260,7 @@ public abstract class AbstractRedisBungeeAPI {
      * @since 0.3
      * @deprecated No longer required
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public final void registerPubSubChannels(String... channels) {
     }
 
@@ -271,7 +271,7 @@ public abstract class AbstractRedisBungeeAPI {
      * @since 0.3
      * @deprecated No longer required
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public final void unregisterPubSubChannels(String... channels) {
     }
 
@@ -352,7 +352,7 @@ public abstract class AbstractRedisBungeeAPI {
      * @since 0.8.0
      * @deprecated
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public void kickPlayer(String playerName, String message) {
         kickPlayer(getUuidFromName(playerName), message);
     }
@@ -365,7 +365,7 @@ public abstract class AbstractRedisBungeeAPI {
      * @since 0.8.0
      * @deprecated
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public void kickPlayer(UUID playerUUID, String message) {
         kickPlayer(playerUUID, Component.text(message));
     }
@@ -402,7 +402,9 @@ public abstract class AbstractRedisBungeeAPI {
      * @throws IllegalStateException if the {@link #getMode()} is not equal to {@link RedisBungeeMode#SINGLE}
      * @see #getJedisPool()
      * @since 0.7.0
+     * @deprecated use {@link #getSummoner() }
      */
+    @Deprecated(forRemoval = true)
     public Jedis requestJedis() {
         if (getMode() == RedisBungeeMode.SINGLE) {
             return getJedisPool().getResource();
@@ -438,7 +440,9 @@ public abstract class AbstractRedisBungeeAPI {
      * @return {@link redis.clients.jedis.JedisCluster}
      * @throws IllegalStateException if the {@link #getMode()} is not equal to {@link RedisBungeeMode#CLUSTER}
      * @since 0.8.0
+     * @deprecated use {@link #getSummoner()}
      */
+    @Deprecated(forRemoval = true)
     public JedisCluster requestClusterJedis() {
         if (getMode() == RedisBungeeMode.CLUSTER) {
             return ((JedisClusterSummoner) this.plugin.getSummoner()).obtainResource();
@@ -454,7 +458,9 @@ public abstract class AbstractRedisBungeeAPI {
      * @return {@link redis.clients.jedis.JedisPooled}
      * @throws IllegalStateException if the {@link #getMode()} is not equal to {@link RedisBungeeMode#SINGLE}
      * @since 0.8.0
+     * @deprecated use {@link #getSummoner()}
      */
+    @Deprecated(forRemoval = true)
     public JedisPooled requestJedisPooled() {
         if (getMode() == RedisBungeeMode.SINGLE) {
             return ((JedisPooledSummoner) this.plugin.getSummoner()).obtainResource();

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

@@ -28,24 +28,22 @@ import redis.clients.jedis.Response;
 import redis.clients.jedis.UnifiedJedis;
 
 import java.net.InetAddress;
-import java.util.HashMap;
+import java.util.*;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 public abstract class PlayerDataManager<P, LE, DE, PS extends IPubSubMessageEvent, SC extends IPlayerChangedServerNetworkEvent, NJE extends IPlayerLeftNetworkEvent, CE> {
 
     protected final RedisBungeePlugin<P> plugin;
-    private final LoadingCache<UUID, String> serverCache = Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.MINUTES).build(this::getServerFromRedis);
-    private final LoadingCache<UUID, String> lastServerCache = Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.MINUTES).build(this::getLastServerFromRedis);
-    private final LoadingCache<UUID, String> proxyCache = Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.MINUTES).build(this::getProxyFromRedis);
-    private final LoadingCache<UUID, InetAddress> ipCache = Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.MINUTES).build(this::getIpAddressFromRedis);
     private final Object SERVERS_TO_PLAYERS_KEY = new Object();
-    private final LoadingCache<Object, Multimap<String, UUID>> serverToPlayersCache = Caffeine.newBuilder().expireAfterWrite(10, TimeUnit.MINUTES).build(this::serversToPlayersBuilder);
     private final UnifiedJedis unifiedJedis;
     private final String proxyId;
     private final String networkId;
+    private final LoadingCache<UUID, String> serverCache = Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.HOURS).build(this::getServerFromRedis);
+    private final LoadingCache<UUID, String> lastServerCache = Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.HOURS).build(this::getLastServerFromRedis);
+    private final LoadingCache<UUID, String> proxyCache = Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.HOURS).build(this::getProxyFromRedis);
+    private final LoadingCache<UUID, InetAddress> ipCache = Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.HOURS).build(this::getIpAddressFromRedis);
+    private final LoadingCache<Object, Multimap<String, UUID>> serverToPlayersCache = Caffeine.newBuilder().expireAfterWrite(10, TimeUnit.MINUTES).build(this::serversToPlayersBuilder);
+    private final JSONComponentSerializer COMPONENT_SERIALIZER = JSONComponentSerializer.json();
 
     public PlayerDataManager(RedisBungeePlugin<P> plugin) {
         this.plugin = plugin;
@@ -56,29 +54,34 @@ 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());
         this.lastServerCache.invalidate(event.getUuid());
+
+        //TODO: We could also rely on redisbungee-serverchange pubsub messages to update the cache in-place without querying redis. That would be a lot more efficient.
+        this.serverToPlayersCache.invalidate(SERVERS_TO_PLAYERS_KEY);
     }
 
     protected void handleNetworkPlayerQuit(IPlayerLeftNetworkEvent event) {
         this.proxyCache.invalidate(event.getUuid());
         this.serverCache.invalidate(event.getUuid());
         this.ipCache.invalidate(event.getUuid());
+
+        //TODO: We could also rely on redisbungee-serverchange pubsub messages to update the cache in-place without querying redis. That would be a lot more efficient.
+        this.serverToPlayersCache.invalidate(SERVERS_TO_PLAYERS_KEY);
     }
 
     protected void handlePubSubMessageEvent(IPubSubMessageEvent event) {
@@ -140,8 +143,6 @@ public abstract class PlayerDataManager<P, LE, DE, PS extends IPubSubMessageEven
         handleServerChangeRedis(uuid, to);
     }
 
-    private final JSONComponentSerializer COMPONENT_SERIALIZER =JSONComponentSerializer.json();
-
     public void kickPlayer(UUID uuid, Component message) {
         if (!plugin.handlePlatformKick(uuid, message)) { // handle locally before SENDING a message
             JSONObject data = new JSONObject();
@@ -213,6 +214,7 @@ public abstract class PlayerDataManager<P, LE, DE, PS extends IPubSubMessageEven
     public String getLastServerFor(UUID uuid) {
         return this.lastServerCache.get(uuid);
     }
+
     public String getServerFor(UUID uuid) {
         return this.serverCache.get(uuid);
     }
@@ -243,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();
                 }
 
@@ -254,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,12 +82,22 @@ 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());
     }
 
     public synchronized void sendCommandTo(String proxyToRun, String command) {
         if (isClosed()) return;
+        if (proxyToRun.equals("allservers") || proxyToRun.equals(this.proxyId())) {
+            handlePlatformCommandExecution(command);
+        }
         publishPayload(new RunCommandPayload(this.proxyId, proxyToRun, command));
     }
 

commands/build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
     `java-library`
-    `maven-publish`
 }
 
 dependencies {
@@ -23,11 +22,3 @@ tasks {
         filteringCharset = Charsets.UTF_8.name()
     }
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("maven") {
-            from(components["java"])
-        }
-    }
-}

gradle.properties

@@ -1,2 +1,2 @@
 group=com.imaginarycode.minecraft
-version=0.12.2
+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. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+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. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 

proxies/bungeecord/build.gradle.kts

@@ -1,12 +1,11 @@
 plugins {
-    `java-library`
+    java
-    `maven-publish`
     id("com.github.johnrengelman.shadow") version "8.1.1"
     id("xyz.jpenilla.run-waterfall") version "2.0.0"
 }
 
 dependencies {
-    api(project(":RedisBungee-API"))
+    implementation(project(":RedisBungee-Bungee"))
     compileOnly(libs.platform.bungeecord) {
         exclude("com.google.guava", "guava")
         exclude("com.google.code.gson", "gson")
@@ -21,23 +20,10 @@ dependencies {
 description = "RedisBungee Bungeecord implementation"
 
 java {
-    withJavadocJar()
     withSourcesJar()
 }
 
-
 tasks {
-    withType<Javadoc> {
-        dependsOn(project(":RedisBungee-API").getTasksByName("javadoc", false))
-        val options = options as StandardJavadocDocletOptions
-        options.use()
-        options.isDocFilesSubDirs = true
-        options.links(
-            "https://ci.md-5.net/job/BungeeCord/ws/api/target/apidocs/", // bungeecord api
-        )
-        val apiDocs = File(rootProject.projectDir, "RedisBungee-API/build/docs/javadoc")
-        options.linksOffline("https://ci.limework.net/RedisBungee/RedisBungee-API/build/docs/javadoc", apiDocs.path)
-    }
     runWaterfall {
         waterfallVersion("1.20")
         environment["REDISBUNGEE_PROXY_ID"] = "bungeecord-1"
@@ -47,9 +33,6 @@ tasks {
         options.encoding = Charsets.UTF_8.name()
         options.release.set(17)
     }
-    javadoc {
-        options.encoding = Charsets.UTF_8.name()
-    }
     processResources {
         filteringCharset = Charsets.UTF_8.name()
         filesMatching("plugin.yml") {
@@ -77,15 +60,9 @@ 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")
 
     }
 
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("maven") {
-            from(components["java"])
-        }
-    }
-}

proxies/bungeecord/bungeecord-api/build.gradle.kts

@@ -0,0 +1,50 @@
+plugins {
+    `java-library`
+    `maven-publish`
+}
+
+dependencies {
+    api(project(":RedisBungee-API"))
+    compileOnly(libs.platform.bungeecord) {
+        exclude("com.google.guava", "guava")
+        exclude("com.google.code.gson", "gson")
+        exclude("net.kyori","adventure-api")
+    }
+}
+
+description = "RedisBungee Bungeecord API"
+
+java {
+    withJavadocJar()
+    withSourcesJar()
+}
+
+
+tasks {
+    withType<Javadoc> {
+        dependsOn(project(":RedisBungee-API").getTasksByName("javadoc", false))
+        val options = options as StandardJavadocDocletOptions
+        options.use()
+        options.isDocFilesSubDirs = true
+        options.links(
+            "https://ci.md-5.net/job/BungeeCord/ws/api/target/apidocs/", // bungeecord api
+        )
+        val apiDocs = File(rootProject.projectDir, "api/build/docs/javadoc")
+        options.linksOffline("https://ci.limework.net/ValioBungee/api/build/docs/javadoc", apiDocs.path)
+    }
+    compileJava {
+        options.encoding = Charsets.UTF_8.name()
+        options.release.set(17)
+    }
+    javadoc {
+        options.encoding = Charsets.UTF_8.name()
+    }
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("maven") {
+            from(components["java"])
+        }
+    }
+}

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()) {
+            // because something can go wrong and proxy somehow does not update player data correctly on shutdown
-                kickPlayer(event.getConnection().getUniqueId(), plugin.langConfiguration().messages().loggedInFromOtherLocation());
+            // we have to check proxy if it has the player
-                // wait 3 seconds before releasing the event
+            String proxyId = getProxyFor(event.getConnection().getUniqueId());
-                plugin.executeAsyncAfter(() -> event.completeIntent((Plugin) plugin), TimeUnit.SECONDS, 3);
+            if (proxyId == null || !plugin.proxyDataManager().isPlayerTrulyOnProxy(proxyId, event.getConnection().getUniqueId())) {
-            } else {
-                event.setCancelled(true);
-                event.setCancelReason(BungeeComponentSerializer.get().serialize(plugin.langConfiguration().messages().alreadyLoggedIn()));
                 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/build.gradle.kts

@@ -1,25 +1,11 @@
 plugins {
-    `java-library`
+    java
-    `maven-publish`
     id("com.github.johnrengelman.shadow") version "8.1.1"
     id("xyz.jpenilla.run-velocity") version "2.0.0"
-
 }
 
-
 dependencies {
-    api(project(":RedisBungee-API")) {
+    implementation(project(":RedisBungee-Velocity"))
-        // Since velocity already includes guava / configurate exlude them
-        exclude("com.google.guava", "guava")
-        exclude("com.google.code.gson", "gson")
-        exclude("org.spongepowered", "configurate-yaml")
-        // exclude also adventure api
-        exclude("net.kyori", "adventure-api")
-        exclude("net.kyori", "adventure-text-serializer-gson")
-        exclude("net.kyori", "adventure-text-serializer-legacy")
-        exclude("net.kyori", "adventure-text-serializer-plain")
-        exclude("net.kyori", "adventure-text-minimessage")
-    }
     compileOnly(libs.platform.velocity)
     annotationProcessor(libs.platform.velocity)
     implementation(project(":RedisBungee-Commands"))
@@ -30,22 +16,10 @@ dependencies {
 description = "RedisBungee Velocity implementation"
 
 java {
-    withJavadocJar()
     withSourcesJar()
 }
 
 tasks {
-    withType<Javadoc> {
-        dependsOn(project(":RedisBungee-API").getTasksByName("javadoc", false))
-        val options = options as StandardJavadocDocletOptions
-        options.use()
-        options.isDocFilesSubDirs = true
-        options.links(
-            "https://jd.papermc.io/velocity/3.0.0/", // velocity api
-        )
-        val apiDocs = File(rootProject.projectDir, "RedisBungee-API/build/docs/javadoc")
-        options.linksOffline("https://ci.limework.net/RedisBungee/RedisBungee-API/build/docs/javadoc", apiDocs.path)
-    }
     runVelocity {
         velocityVersion("3.3.0-SNAPSHOT")
         environment["REDISBUNGEE_PROXY_ID"] = "velocity-1"
@@ -55,9 +29,6 @@ tasks {
         options.encoding = Charsets.UTF_8.name()
         options.release.set(17)
     }
-    javadoc {
-        options.encoding = Charsets.UTF_8.name()
-    }
     processResources {
         filteringCharset = Charsets.UTF_8.name()
     }
@@ -75,10 +46,3 @@ tasks {
 
 }
 
-publishing {
-    publications {
-        create<MavenPublication>("maven") {
-            from(components["java"])
-        }
-    }
-}

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

@@ -26,7 +26,6 @@ import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ServerConnection;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import com.velocitypowered.api.proxy.server.ServerPing;
-import net.kyori.adventure.text.Component;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -146,8 +145,11 @@ public class RedisBungeeListener {
                     return;
                 }
             }
-
+            try {
-            ((ServerConnection) event.getSource()).sendPluginMessage(event.getIdentifier(), out.toByteArray());
+                // ServerConnection throws IllegalStateException when connection dies somehow so just ignore :/
+                ((ServerConnection) event.getSource()).sendPluginMessage(event.getIdentifier(), out.toByteArray());
+            } catch (IllegalStateException ignored) {
+            }
         });
 
     }

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

@@ -68,7 +68,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 @Plugin(id = "redisbungee", name = "RedisBungee", version = Constants.VERSION, url = "https://github.com/ProxioDev/RedisBungee", authors = {"astei", "ProxioDev"})
-public class RedisBungeeVelocityPlugin implements RedisBungeePlugin<Player>, ConfigLoader, LangConfigLoader {
+public class RedisBungeeVelocityPlugin implements RedisBungeePlugin<Player>, ConfigLoader, LangConfigLoader, ServerObjectFetcher {
     private final ProxyServer server;
     private final Logger logger;
     private final Path dataFolder;

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()) {
+            // because something can go wrong and proxy somehow does not update player data correctly on shutdown
-                kickPlayer(event.getPlayer().getUniqueId(), plugin.langConfiguration().messages().loggedInFromOtherLocation());
+            // we have to check proxy if it has the player
-                // wait 3 seconds before releasing the event
+            String proxyId = getProxyFor(event.getPlayer().getUniqueId());
-                plugin.executeAsyncAfter(continuation::resume, TimeUnit.SECONDS, 3);
+            if (proxyId == null || !plugin.proxyDataManager().isPlayerTrulyOnProxy(proxyId, event.getPlayer().getUniqueId())) {
-            } else {
-                event.setResult(ResultedEvent.ComponentResult.denied(plugin.langConfiguration().messages().alreadyLoggedIn()));
                 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) {

proxies/velocity/velocity-api/build.gradle.kts

@@ -0,0 +1,61 @@
+plugins {
+    `java-library`
+    `maven-publish`
+}
+
+dependencies {
+    api(project(":RedisBungee-API")) {
+        // Since velocity already includes guava / configurate exlude them
+        exclude("com.google.guava", "guava")
+        exclude("com.google.code.gson", "gson")
+        exclude("org.spongepowered", "configurate-yaml")
+        // exclude also adventure api
+        exclude("net.kyori", "adventure-api")
+        exclude("net.kyori", "adventure-text-serializer-gson")
+        exclude("net.kyori", "adventure-text-serializer-legacy")
+        exclude("net.kyori", "adventure-text-serializer-plain")
+        exclude("net.kyori", "adventure-text-minimessage")
+    }
+    compileOnly(libs.platform.velocity)
+
+}
+
+description = "RedisBungee Velocity API"
+
+java {
+    withJavadocJar()
+    withSourcesJar()
+}
+
+tasks {
+    withType<Javadoc> {
+        dependsOn(project(":RedisBungee-API").getTasksByName("javadoc", false))
+        val options = options as StandardJavadocDocletOptions
+        options.use()
+        options.isDocFilesSubDirs = true
+        options.links(
+            "https://jd.papermc.io/velocity/3.0.0/", // velocity api
+        )
+        val apiDocs = File(rootProject.projectDir, "api/build/docs/javadoc")
+        options.linksOffline("https://ci.limework.net/ValioBungee/api/build/docs/javadoc", apiDocs.path)
+    }
+    compileJava {
+        options.encoding = Charsets.UTF_8.name()
+        options.release.set(17)
+    }
+    javadoc {
+        options.encoding = Charsets.UTF_8.name()
+    }
+    processResources {
+        filteringCharset = Charsets.UTF_8.name()
+    }
+
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("maven") {
+            from(components["java"])
+        }
+    }
+}

proxies/velocity/velocity-api/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeAPI.java

@@ -49,7 +49,7 @@ public class RedisBungeeAPI extends AbstractRedisBungeeAPI {
     public final ServerInfo getServerFor(@NonNull UUID player) {
         String serverName = this.getServerNameFor(player);
         if (serverName == null) return null;
-        return ((RedisBungeeVelocityPlugin) this.plugin).getProxy().getServer(serverName).map((RegisteredServer::getServerInfo)).orElse(null);
+        return ((ServerObjectFetcher) this.plugin).getProxy().getServer(serverName).map((RegisteredServer::getServerInfo)).orElse(null);
     }
 
     /**

proxies/velocity/velocity-api/src/main/java/com/imaginarycode/minecraft/redisbungee/ServerObjectFetcher.java

@@ -0,0 +1,10 @@
+package com.imaginarycode.minecraft.redisbungee;
+
+import com.velocitypowered.api.proxy.ProxyServer;
+
+public interface ServerObjectFetcher {
+
+    ProxyServer getProxy();
+
+
+}

settings.gradle.kts

@@ -4,12 +4,31 @@ pluginManagement {
     }
 }
 
-rootProject.name = "RedisBungee-Parent"
+rootProject.name = "ValioBungee"
+
+include(":RedisBungee-API")
+project(":RedisBungee-API").projectDir = file("api")
+
+include(":RedisBungee-Commands")
+project(":RedisBungee-Commands").projectDir = file("commands")
 
 include(":RedisBungee-Velocity")
-include(":RedisBungee-Commands")
+project(":RedisBungee-Velocity").projectDir = file("proxies/velocity")
+
 include(":RedisBungee-Bungee")
-include(":RedisBungee-API")
+project(":RedisBungee-Bungee").projectDir = file("proxies/bungeecord/bungeecord-api")
+
+include(":RedisBungee-Proxy-Bungee")
+project(":RedisBungee-Proxy-Bungee").projectDir = file("proxies/bungeecord")
+
+include(":RedisBungee-Velocity")
+project(":RedisBungee-Velocity").projectDir = file("proxies/velocity/velocity-api")
+
+include(":RedisBungee-Proxy-Velocity")
+project(":RedisBungee-Proxy-Velocity").projectDir = file("proxies/velocity")
+
+
+
 
 dependencyResolutionManagement {
     repositories {
@@ -37,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";
 
 
@@ -73,4 +92,4 @@ dependencyResolutionManagement {
     }
 
 
-}
+}