Fix server synchronization on reconnect

Author: isnsest

src/main/java/com/isnsest/denizen/velocity/DenizenConnection.java

@@ -1,7 +1,7 @@
 package com.isnsest.denizen.velocity;
 
-import com.isnsest.denizen.velocity.packets.out.AddServerPacketOut;
-import com.isnsest.denizen.velocity.packets.out.RemoveServerPacketOut;
+import com.isnsest.denizen.velocity.packets.in.*;
+import com.isnsest.denizen.velocity.packets.out.*;
 import com.velocitypowered.api.event.proxy.ProxyPingEvent;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import com.velocitypowered.api.proxy.server.ServerPing;
@@ -83,13 +83,17 @@ public synchronized void sendPacket(PacketOut packet) {
 
     public void broadcastIdentity() {
         DenizenVelocity.instance.server.getScheduler().buildTask(DenizenVelocity.instance, () -> {
-            if (thisServer != null) DenizenVelocity.instance.broadcastPacket(new AddServerPacketOut(thisServer.getServerInfo().getName()));
+            if (thisServer != null) {
+                DenizenVelocity.instance.broadcastPacket(new AddServerPacketOut(thisServer.getServerInfo().getName()));
+            }
         }).schedule();
     }
 
     public void broadcastRemoval() {
         DenizenVelocity.instance.server.getScheduler().buildTask(DenizenVelocity.instance, () -> {
-            if (thisServer != null) DenizenVelocity.instance.broadcastPacket(new RemoveServerPacketOut(thisServer.getServerInfo().getName()));
+            if (thisServer != null) {
+                DenizenVelocity.instance.broadcastPacket(new RemoveServerPacketOut(thisServer.getServerInfo().getName()));
+            }
         }).schedule();
     }
 
@@ -136,7 +140,6 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
                     if (DenizenVelocity.instance.packets.containsKey(id)) {
                         packetBuffer.resetReaderIndex();
                         handshakeFound = true;
-                        DenizenVelocity.instance.logger.info("Connected server: " + connectionName);
                         break;
                     } else {
                         packetBuffer.resetReaderIndex();

src/main/java/com/isnsest/denizen/velocity/DenizenVelocity.java

@@ -13,7 +13,6 @@
 import com.velocitypowered.api.plugin.Plugin;
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import com.velocitypowered.api.proxy.ProxyServer;
-import com.velocitypowered.api.proxy.server.RegisteredServer;
 import com.velocitypowered.api.proxy.server.ServerPing;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelFuture;
@@ -31,7 +30,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
-@Plugin(id = "denizen-velocity", name = "denizen-velocity", version = "1.1", authors = {"isnsest"})
+@Plugin(id = "denizen-velocity", name = "denizen-velocity", version = "1.2", authors = {"isnsest"})
 public class DenizenVelocity {
 
     public static DenizenVelocity instance;
@@ -41,8 +40,6 @@ public class DenizenVelocity {
     public static YamlConfig config;
 
     private static int DEPENIZEN_PORT = 0;
-    // public static boolean proxyCommandNoDup = false;
-    // public static long proxyCommandId = 1;
 
     public HashMap<Integer, PacketIn> packets = new HashMap<>();
     private final List<DenizenConnection> connections = new ArrayList<>();
@@ -140,32 +137,8 @@ private void startServer() {
                             @Override
                             public void initChannel(SocketChannel ch) {
                                 InetSocketAddress remoteAddress = ch.remoteAddress();
-                                String remoteIp = remoteAddress.getAddress().getHostAddress();
-
-                                RegisteredServer matchedServer = null;
-                                for (RegisteredServer rs : server.getAllServers()) {
-                                    String serverIp = rs.getServerInfo().getAddress().getAddress().getHostAddress();
-                                    if (serverIp.equals(remoteIp)) {
-                                        matchedServer = rs;
-                                        break;
-                                    }
-                                    if ((remoteIp.equals("127.0.0.1") || remoteIp.equals("0:0:0:0:0:0:0:1"))
-                                            && (rs.getServerInfo().getAddress().getAddress().isLoopbackAddress())) {
-                                        matchedServer = rs;
-                                        break;
-                                    }
-                                }
-
-                                if (matchedServer == null) {
-                                    logger.warn("BLOCKED connection from " + remoteIp);
-                                    ch.close();
-                                    return;
-                                }
-
-                                logger.info("Accepted connection from " + remoteIp + " as server: " + matchedServer.getServerInfo().getName());
 
                                 DenizenConnection depenConnection = new DenizenConnection();
-                                depenConnection.thisServer = matchedServer;
                                 depenConnection.build(ch, remoteAddress.getAddress());
                             }
                         });
@@ -241,7 +214,6 @@ public void onProxyPing(ProxyPingEvent event) {
                     finalPing.version(finalVersion);
 
                     event.setPing(finalPing.build());
-
                 } catch (Exception e) {
                     connection.proxyPingWaiters.remove(id);
                 }
@@ -253,7 +225,9 @@ public void onProxyPing(ProxyPingEvent event) {
 
     public void broadcastPacket(PacketOut packet) {
         for (DenizenConnection connection : getConnections()) {
-            connection.sendPacket(packet);
+            if (connection.thisServer != null) {
+                connection.sendPacket(packet);
+            }
         }
     }
 }

src/main/java/com/isnsest/denizen/velocity/packets/in/MyInfoPacketIn.java

@@ -3,6 +3,7 @@
 import com.isnsest.denizen.velocity.DenizenConnection;
 import com.isnsest.denizen.velocity.DenizenVelocity;
 import com.isnsest.denizen.velocity.PacketIn;
+import com.isnsest.denizen.velocity.packets.out.AddServerPacketOut;
 import com.isnsest.denizen.velocity.packets.out.YourInfoPacketOut;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import io.netty.buffer.ByteBuf;
@@ -38,7 +39,22 @@ public void process(DenizenConnection connection, ByteBuf data) {
             return;
         }
 
-        connection.sendPacket(new YourInfoPacketOut(connection.thisServer.getServerInfo().getName()));
+        String serverName = connection.thisServer.getServerInfo().getName();
+
+        DenizenConnection existing = DenizenVelocity.instance.getConnectionByName(serverName);
+        if (existing != null && existing != connection) {
+            existing.fail("Replaced by new connection");
+        }
+
+        connection.sendPacket(new YourInfoPacketOut(serverName));
+
+        for (DenizenConnection conn : DenizenVelocity.instance.getConnections()) {
+            if (conn != connection && conn.thisServer != null) {
+                connection.sendPacket(new AddServerPacketOut(conn.thisServer.getServerInfo().getName()));
+            }
+        }
+
         connection.broadcastIdentity();
+        DenizenVelocity.instance.logger.info("Connected server: " + connection.connectionName + " as: " + serverName);
     }
 }