Merge pull request 'Update EloPlayerHandler and EloSchemHandler to handle non schem FightEndsPackets' (#519) from EloForMissileWars into master

Reviewed-on: #519
Reviewed-by: Lixfel <lixfel@steamwar.de>

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.getByChat(fightEndsPacket.getGameMode());
+        } else {
+            arenaMode = ArenaMode.getBySchemType(schematicType);
+        }
+        if (arenaMode == null) return;
+        if (!arenaMode.isRanked()) return;
 
         if (EloSchemHandler.publicVsPrivate(fightEndsPacket))
             return;

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;