check if player is really on the proxy when connecting

this prevents logged in error if somehow proxy shutdowns at weird time
ProxioDev · Jun 17, 2024 · 4e3abc9 · 4e3abc9
1 parent be0c6be
commit 4e3abc9
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 15 deletions.
diff --git a/api/src/main/java/com/imaginarycode/minecraft/redisbungee/api/ProxyDataManager.java b/api/src/main/java/com/imaginarycode/minecraft/redisbungee/api/ProxyDataManager.java
@@ -82,6 +82,13 @@ public Set<UUID> getPlayersOn(String proxyId) {
         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());
     }

diff --git a/...eecord/src/main/java/com/imaginarycode/minecraft/redisbungee/BungeePlayerDataManager.java b/...eecord/src/main/java/com/imaginarycode/minecraft/redisbungee/BungeePlayerDataManager.java
@@ -12,12 +12,10 @@
 
 import com.imaginarycode.minecraft.redisbungee.api.PlayerDataManager;
 import com.imaginarycode.minecraft.redisbungee.api.RedisBungeePlugin;
-import com.imaginarycode.minecraft.redisbungee.api.events.IPlayerJoinedNetworkEvent;
 import com.imaginarycode.minecraft.redisbungee.events.PlayerChangedServerNetworkEvent;
 import com.imaginarycode.minecraft.redisbungee.events.PlayerJoinedNetworkEvent;
 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;
@@ -74,14 +72,21 @@ public void onLoginEvent(LoginEvent event) {
         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);

diff --git a/...city/src/main/java/com/imaginarycode/minecraft/redisbungee/VelocityPlayerDataManager.java b/...city/src/main/java/com/imaginarycode/minecraft/redisbungee/VelocityPlayerDataManager.java
@@ -75,13 +75,20 @@ public void onServerConnectedEvent(ServerConnectedEvent event) {
     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();