Use Transfer Packet for Event Velocity

.gitignore

@@ -16,4 +16,8 @@ bin/
 .vscode
 
 # Other
-lib
+lib
+/WebsiteBackend/data
+/WebsiteBackend/logs
+/WebsiteBackend/skins
+/WebsiteBackend/config.json

CommonCore/SQL/src/de/steamwar/sql/EventFight.java

@@ -39,6 +39,7 @@ public class EventFight implements Comparable<EventFight> {
     private static final SelectStatement<EventFight> byId = table.select(Table.PRIMARY);
     private static final SelectStatement<EventFight> allComing = new SelectStatement<>(table, "SELECT * FROM EventFight WHERE StartTime > now() ORDER BY StartTime ASC");
     private static final SelectStatement<EventFight> event = new SelectStatement<>(table, "SELECT * FROM EventFight WHERE EventID = ? ORDER BY StartTime ASC");
+    private static final SelectStatement<EventFight> activeFights = new SelectStatement<>(table, "SELECT * FROM EventFight WHERE Fight IS NOT NULL AND StartTime > now() AND DATEDIFF(StartTime, now()) < 0");
     private static final Statement reschedule = table.update(Table.PRIMARY, "StartTime");
     private static final Statement setResult = table.update(Table.PRIMARY, "Ergebnis");
     private static final Statement setFight = table.update(Table.PRIMARY, "Fight");
@@ -63,6 +64,19 @@ public class EventFight implements Comparable<EventFight> {
         return event.listSelect(eventID);
     }
 
+    private static List<EventFight> activeFightsCache = null;
+
+    public static void clearActiveFightsCache() {
+        activeFightsCache = null;
+    }
+
+    public static List<EventFight> getActiveFights() {
+        if (activeFightsCache == null) {
+            activeFightsCache = activeFights.listSelect();
+        }
+        return activeFightsCache;
+    }
+
     public static EventFight create(int event, Timestamp from, String spielmodus, String map, int blueTeam, int redTeam, Integer spectatePort) {
         return get(create.insertGetKey(event, from, spielmodus, map, blueTeam, redTeam, spectatePort));
     }

VelocityCore/src/de/steamwar/velocitycore/EventStarter.java

@@ -23,6 +23,7 @@ import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.persistent.Subserver;
 import de.steamwar.sql.EventFight;
+import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.Team;
 import net.kyori.adventure.text.event.ClickEvent;
 
@@ -68,6 +69,13 @@ public class EventStarter {
                 starter.callback(subserver -> {
                     eventServer.put(blue.getTeamId(), subserver);
                     eventServer.put(red.getTeamId(), subserver);
+
+                    VelocityCore.getProxy().getAllPlayers().forEach(player -> {
+                        SteamwarUser user = SteamwarUser.get(player.getUniqueId());
+                        if (user.getTeam() == blue.getTeamId() || user.getTeam() == red.getTeamId()) {
+                            subserver.sendPlayer(player);
+                        }
+                    });
                 }).start();
 
                 command = "/event " + blue.getTeamKuerzel();
@@ -76,6 +84,7 @@ public class EventStarter {
             }
             Chatter.broadcast().system("EVENT_FIGHT_BROADCAST", new Message("EVENT_FIGHT_BROADCAST_HOVER"), ClickEvent.runCommand(command), blue.getTeamColor(), blue.getTeamName(), red.getTeamColor(), red.getTeamName());
         }
+        EventFight.clearActiveFightsCache();
     }
 
     private EventFight nextFight(Queue<EventFight> fights){

VelocityCore/src/de/steamwar/velocitycore/commands/ServerSwitchCommand.java

@@ -19,22 +19,40 @@
 
 package de.steamwar.velocitycore.commands;
 
+import java.net.InetSocketAddress;
+import java.util.List;
+
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.PlayerChatter;
+import de.steamwar.sql.EventFight;
+import de.steamwar.sql.SteamwarUser;
 
 public class ServerSwitchCommand extends SWCommand {
 
     private final RegisteredServer server;
+    private final boolean isSpectateServer;
 
-    public ServerSwitchCommand(String cmd, String name, String... aliases) {
+    public ServerSwitchCommand(String cmd, String name, boolean isSpectateServer, String... aliases) {
         super(cmd, null, aliases);
         server = VelocityCore.getProxy().getServer(name).orElseThrow();
+        this.isSpectateServer = isSpectateServer;
     }
 
     @Register
     public void genericCommand(PlayerChatter sender) {
+        if (isSpectateServer) {
+            SteamwarUser user = SteamwarUser.get(sender.getPlayer().getUniqueId());
+            List<EventFight> activeFights = EventFight.getActiveFights();
+
+            if (activeFights.stream()
+                    .anyMatch(fight -> fight.getTeamRed() == user.getTeam() || fight.getTeamBlue() == user.getTeam())) {
+                sender.getPlayer().transferToHost(new InetSocketAddress("steamwar.de", 25566));
+                return;
+            }
+        }
+
         sender.getPlayer().createConnectionRequest(server).fireAndForget();
     }
 }

VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java

@@ -19,31 +19,63 @@
 
 package de.steamwar.velocitycore.listeners;
 
+import java.net.InetSocketAddress;
+import java.util.List;
+
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.PostLoginEvent;
-import de.steamwar.messages.Chatter;
+import com.velocitypowered.api.event.player.ServerConnectedEvent;
+import com.velocitypowered.api.proxy.Player;
+
+import de.steamwar.persistent.Subserver;
 import de.steamwar.sql.Event;
+import de.steamwar.sql.EventFight;
 import de.steamwar.sql.Referee;
+import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.TeamTeilnahme;
+import de.steamwar.velocitycore.EventStarter;
 
 public class EventModeListener extends BasicListener {
 
     @Subscribe
     public void onPostLogin(PostLoginEvent e) {
-        Chatter sender = Chatter.disconnect(e.getPlayer());
+        Player player = e.getPlayer();
+        SteamwarUser user = SteamwarUser.get(player.getUniqueId());
 
         Event event = Event.get();
-        if(event == null) {
-            sender.system("EVENTMODE_KICK");
+        if (event == null) {
+            player.transferToHost(new InetSocketAddress("steamwar.de", 25565));
             return;
         }
 
-        if(TeamTeilnahme.nimmtTeil(sender.user().getTeam(), event.getEventID()))
+        if (TeamTeilnahme.nimmtTeil(user.getTeam(), event.getEventID())) {
+
+            Subserver server = EventStarter.getEventServer().get(user.getTeam());
+
+            if (server != null) {
+                server.sendPlayer(player);
+            }
+
+            return;
+        }
+
+        if (Referee.get(event.getEventID()).contains(user.getId()))
             return;
 
-        if(Referee.get(event.getEventID()).contains(sender.user().getId()))
-            return;
+        player.transferToHost(new InetSocketAddress("steamwar.de", 25565));
+    }
 
-        sender.system("EVENTMODE_KICK");
+    @Subscribe
+    public void onLobby(ServerConnectedEvent e) {
+        Player player = e.getPlayer();
+        SteamwarUser user = SteamwarUser.get(player.getUniqueId());
+
+        EventFight.clearActiveFightsCache();
+        List<EventFight> activeFights = EventFight.getActiveFights();
+
+        if (activeFights.stream()
+                .noneMatch(fight -> fight.getTeamRed() == user.getTeam() || fight.getTeamBlue() == user.getTeam())) {
+            player.transferToHost(new InetSocketAddress("steamwar.de", 25565));
+        }
     }
 }