possible fix for the already conncted player if the player is not con…

…nected
CloudNetService · Nov 17, 2018 · 038845d · einrobin · Apr 24, 2019 · juliarn
1 parent dd1327d
commit 038845d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 18 deletions.
diff --git a/...et-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/ProxiedBootstrap.java b/...et-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/ProxiedBootstrap.java
@@ -13,7 +13,6 @@
 import de.dytanic.cloudnet.bridge.internal.command.proxied.CommandPermissions;
 import de.dytanic.cloudnet.bridge.internal.command.proxied.defaults.CommandIp;
 import de.dytanic.cloudnet.bridge.internal.listener.proxied.ProxiedListener;
-import de.dytanic.cloudnet.bridge.internal.packetio.PacketOutProxyPing;
 import de.dytanic.cloudnet.lib.utility.CollectionWrapper;
 import de.dytanic.cloudnet.lib.utility.threading.Runnabled;
 import net.md_5.bungee.api.ProxyServer;
@@ -87,9 +86,9 @@ public void run()
             @Override
             public void run()
             {
-                CloudAPI.getInstance().getNetworkConnection().sendPacket(new PacketOutProxyPing());
+                CloudProxy.getInstance().update();
             }
-        }, 0, 1, TimeUnit.MINUTES);
+        }, 0, 1, TimeUnit.SECONDS);
     }
 
     @Override

diff --git a/...bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/packetio/PacketOutProxyPing.java b/...bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/packetio/PacketOutProxyPing.java
diff --git a/cloudnet-api/cloudnet-api-core/src/main/java/de/dytanic/cloudnet/api/CloudAPI.java b/cloudnet-api/cloudnet-api-core/src/main/java/de/dytanic/cloudnet/api/CloudAPI.java
@@ -114,15 +114,13 @@ public void shutdown()
         this.networkConnection.tryDisconnect();
     }
 
-    @Deprecated
     public CloudAPI update(ServerInfo serverInfo)
     {
         if (networkConnection.isConnected())
             networkConnection.sendPacket(new PacketOutUpdateServerInfo(serverInfo));
         return this;
     }
 
-    @Deprecated
     public CloudAPI update(ProxyInfo proxyInfo)
     {
         if (networkConnection.isConnected())

diff --git a/cloudnet-core/src/main/java/de/dytanic/cloudnetcore/network/NetworkManager.java b/cloudnet-core/src/main/java/de/dytanic/cloudnetcore/network/NetworkManager.java
@@ -41,6 +41,7 @@
 import de.dytanic.cloudnetcore.util.MessageConfig;
 import lombok.Getter;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.UUID;
@@ -218,6 +219,16 @@ public void handleProxyInfoUpdate(ProxyServer proxyServer, ProxyInfo incoming)
     {
         CloudNet.getInstance().getEventManager().callEvent(new ProxyInfoUpdateEvent(proxyServer, incoming));
 
+        Collection<UUID> players = new ArrayList<>();
+
+        for (ProxyServer proxy : CloudNet.getInstance().getProxys().values())
+            for (MultiValue<UUID, String> multiValue : proxy.getProxyInfo().getPlayers())
+                players.add(multiValue.getFirst());
+
+        for (CloudPlayer cloudPlayer : this.onlinePlayers.values())
+            if (!players.contains(cloudPlayer.getUniqueId()))
+                this.onlinePlayers.remove(cloudPlayer.getUniqueId());
+
         this.sendAllUpdate(new PacketOutUpdateProxyInfo(incoming));
         this.sendAll(new PacketOutUpdateOnlineCount(getOnlineCount()));
     }