Add Missing Commits

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

@@ -20,6 +20,7 @@
 package de.steamwar.velocitycore;
 
 import de.steamwar.messages.Chatter;
+import de.steamwar.messages.Message;
 import de.steamwar.persistent.Subserver;
 import de.steamwar.sql.EventFight;
 import de.steamwar.sql.Team;
@@ -43,7 +44,7 @@ public class EventStarter {
 
     public EventStarter() {
         EventFight.loadAllComingFights();
-        VelocityCore.schedule(this::run).delay(10, TimeUnit.SECONDS).schedule();
+        VelocityCore.schedule(this::run).repeat(10, TimeUnit.SECONDS).schedule();
     }
 
     public static Map<Integer, Subserver> getEventServer() {
@@ -73,7 +74,7 @@ public class EventStarter {
             } else {
                 command = "/" + spectatePorts.get(next.getSpectatePort());
             }
-            Chatter.broadcast().system("EVENT_FIGHT_BROADCAST", "EVENT_FIGHT_BROADCAST_HOVER", ClickEvent.runCommand(command), blue.getTeamColor(), blue.getTeamName(), red.getTeamColor(), red.getTeamName());
+            Chatter.broadcast().system("EVENT_FIGHT_BROADCAST", new Message("EVENT_FIGHT_BROADCAST_HOVER"), ClickEvent.runCommand(command), blue.getTeamColor(), blue.getTeamName(), red.getTeamColor(), red.getTeamName());
         }
     }
 

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

@@ -130,7 +130,7 @@ public class FightCommand extends SWCommand {
     public void fight(@Validator("arenaPlayer") PlayerChatter sender, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull ArenaMode arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
         createArena(sender, "/fight ", true, arenaMode, map, false,
                 (p, mode, m) -> new ServerStarter().arena(mode, m).blueLeader(p.getPlayer()).callback(
-                        arena -> Chatter.broadcast().system("FIGHT_BROADCAST", new Message("FIGHT_BROADCAST_HOVER"), ClickEvent.runCommand("/arena " + arena.getServer().getName()), mode.getGameName(), p.getPlayer().getUsername())
+                        arena -> Chatter.broadcast().system("FIGHT_BROADCAST", new Message("FIGHT_BROADCAST_HOVER", p.getPlayer().getUsername()), ClickEvent.runCommand("/arena " + arena.getServer().getName()), mode.getGameName(), p.getPlayer().getUsername())
                 ).start()
         );
     }

VelocityCore/src/de/steamwar/velocitycore/mods/Badlion.java

@@ -22,6 +22,7 @@ package de.steamwar.velocitycore.mods;
 import com.google.gson.JsonObject;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
+import de.steamwar.messages.Chatter;
 
 public class Badlion {
     // https://github.com/BadlionClient/BadlionClientModAPI
@@ -50,6 +51,10 @@ public class Badlion {
     }
 
     public void sendRestrictions(Player player) {
+        // TODO: Remove when Badlion is fixed, or we fixed the Badlion packet
+        Chatter sender = Chatter.of(player);
+        player.disconnect(sender.parse("CLIENT_DISALLOWED", "Badlion"));
+
         player.sendPluginMessage(MinecraftChannelIdentifier.from("badlion:mods"), packet);
     }
 }

VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloPlayerHandler.java

@@ -20,13 +20,13 @@
 package de.steamwar.velocitycore.network.handlers;
 
 import com.velocitypowered.api.proxy.Player;
-import de.steamwar.velocitycore.ArenaMode;
-import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.network.packets.PacketHandler;
 import de.steamwar.network.packets.common.FightEndsPacket;
 import de.steamwar.sql.SchematicType;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserElo;
+import de.steamwar.velocitycore.ArenaMode;
+import de.steamwar.velocitycore.VelocityCore;
 import lombok.RequiredArgsConstructor;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
@@ -52,8 +52,15 @@ public class EloPlayerHandler extends PacketHandler {
      */
     @Handler
     public void handle(FightEndsPacket fightEndsPacket) {
-        if (!ArenaMode.getBySchemType(SchematicType.fromDB(fightEndsPacket.getGameMode())).isRanked())
-            return;
+        SchematicType schematicType = SchematicType.fromDB(fightEndsPacket.getGameMode());
+        ArenaMode arenaMode;
+        if (schematicType == null) {
+            arenaMode = ArenaMode.getByInternal(fightEndsPacket.getGameMode());
+        } else {
+            arenaMode = ArenaMode.getBySchemType(schematicType);
+        }
+        if (arenaMode == null) return;
+        if (!arenaMode.isRanked()) return;
 
         if (EloSchemHandler.publicVsPrivate(fightEndsPacket))
             return;

VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloSchemHandler.java

@@ -19,18 +19,21 @@
 
 package de.steamwar.velocitycore.network.handlers;
 
-import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.network.packets.PacketHandler;
 import de.steamwar.network.packets.common.FightEndsPacket;
 import de.steamwar.sql.SchemElo;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SchematicType;
+import de.steamwar.velocitycore.ArenaMode;
 
 public class EloSchemHandler extends PacketHandler {
 
     private static final int K = 20;
 
     public static boolean publicVsPrivate(FightEndsPacket packet) {
+        if (packet.getRedSchem() == -1 && packet.getBlueSchem() == -1) {
+            return false;
+        }
         SchematicNode blueSchem = SchematicNode.getSchematicNode(packet.getBlueSchem());
         SchematicNode redSchem = SchematicNode.getSchematicNode(packet.getRedSchem());
         return (blueSchem.getOwner() == 0) != (redSchem.getOwner() == 0);
@@ -38,9 +41,10 @@ public class EloSchemHandler extends PacketHandler {
 
     @Handler
     public void handle(FightEndsPacket fightEndsPacket) {
-        if (!ArenaMode.getBySchemType(SchematicType.fromDB(fightEndsPacket.getGameMode())).isRanked()) {
-            return;
-        }
+        SchematicType type = SchematicType.fromDB(fightEndsPacket.getGameMode());
+        if (type == null) return;
+        ArenaMode arenaMode = ArenaMode.getBySchemType(type);
+        if (!arenaMode.isRanked()) return;
 
         if (publicVsPrivate(fightEndsPacket))
             return;