From cbc1dd6505038fb5e7de1a6194c99e0bce6d97a2 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Fri, 1 Apr 2022 10:55:29 +0200
Subject: [PATCH 01/33] Update some stuff

---
 .../bungeecore/comms/handlers/FightEndsHandler.java       | 8 ++++----
 src/de/steamwar/bungeecore/sql/UserElo.java               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
index 0dda622d..b563a7fb 100644
--- a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
+++ b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
@@ -23,10 +23,7 @@ import com.google.common.io.ByteArrayDataInput;
 import de.steamwar.bungeecore.ArenaMode;
 import de.steamwar.bungeecore.comms.SpigotHandler;
 import de.steamwar.bungeecore.comms.packets.FightEndsPacket;
-import de.steamwar.bungeecore.sql.SchemElo;
-import de.steamwar.bungeecore.sql.SchematicNode;
-import de.steamwar.bungeecore.sql.SchematicType;
-import de.steamwar.bungeecore.sql.UserElo;
+import de.steamwar.bungeecore.sql.*;
 import net.md_5.bungee.api.config.ServerInfo;
 
 import java.util.List;
@@ -66,6 +63,8 @@ public class FightEndsHandler implements SpigotHandler {
             blueResult = 0;
         }
 
+        // TODO: Implement hourly unranked when against same team maybe half hourly
+
         int blueSchemElo = SchemElo.getElo(fightEndsPacket.getBlueSchem());
         int redSchemElo = SchemElo.getElo(fightEndsPacket.getRedSchem());
 
@@ -84,6 +83,7 @@ public class FightEndsHandler implements SpigotHandler {
         double winTeamExpectation = 1 / (1 + Math.pow(10, (eloTeamEnemy - eloTeamOwn) / 600f));
         for (int player : players) {
             int playerElo = UserElo.getEloOrDefault(player, gameMode);
+            int fights = UserElo.getFightsOfSeason(player, gameMode);
             UserElo.setElo(player, gameMode, (int) Math.round(playerElo + K * (result - winTeamExpectation)));
         }
     }
diff --git a/src/de/steamwar/bungeecore/sql/UserElo.java b/src/de/steamwar/bungeecore/sql/UserElo.java
index 67409661..efa00782 100644
--- a/src/de/steamwar/bungeecore/sql/UserElo.java
+++ b/src/de/steamwar/bungeecore/sql/UserElo.java
@@ -56,7 +56,7 @@ public class UserElo {
         }, userID, gameMode, Season.getSeason()));
     }
 
-    private static int getFightsOfSeason(int userID, String gameMode) {
+    public static int getFightsOfSeason(int userID, String gameMode) {
         return fightsOfSeason.select(rs -> {
             if (rs.next())
                 return rs.getInt("Fights");

From bbd2b1950b22473d9ad671f15529415c84f30560 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Fri, 1 Apr 2022 12:05:41 +0200
Subject: [PATCH 02/33] Update FightEndsHandler

---
 .../steamwar/bungeecore/comms/handlers/FightEndsHandler.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
index b563a7fb..b0f59623 100644
--- a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
+++ b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
@@ -84,7 +84,8 @@ public class FightEndsHandler implements SpigotHandler {
         for (int player : players) {
             int playerElo = UserElo.getEloOrDefault(player, gameMode);
             int fights = UserElo.getFightsOfSeason(player, gameMode);
-            UserElo.setElo(player, gameMode, (int) Math.round(playerElo + K * (result - winTeamExpectation)));
+            double multiplier = Math.max(1.2 - (fights / 200.0), 0.8);
+            UserElo.setElo(player, gameMode, (int) Math.round(playerElo + K * (result - winTeamExpectation) * multiplier));
         }
     }
 }

From 895ac9843b63dde7caaa2c743578ac7d629b4ed6 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Fri, 1 Apr 2022 12:19:56 +0200
Subject: [PATCH 03/33] Update FightEndsHandler

---
 .../comms/handlers/FightEndsHandler.java      | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
index b0f59623..47e3f896 100644
--- a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
+++ b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
@@ -26,11 +26,15 @@ import de.steamwar.bungeecore.comms.packets.FightEndsPacket;
 import de.steamwar.bungeecore.sql.*;
 import net.md_5.bungee.api.config.ServerInfo;
 
+import java.sql.Timestamp;
+import java.time.Instant;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class FightEndsHandler implements SpigotHandler {
 
     private int K = 20;
+    private long fightRange = 1000 /* Milliseconds */ * 60 /* Seconds */ * 30 /* Minutes */;
 
     @Override
     public void handle(ByteArrayDataInput in, ServerInfo info) {
@@ -63,7 +67,9 @@ public class FightEndsHandler implements SpigotHandler {
             blueResult = 0;
         }
 
-        // TODO: Implement hourly unranked when against same team maybe half hourly
+        if (teamComboExistedAlready(fightEndsPacket.getBluePlayers(), fightEndsPacket.getRedPlayers(), fightEndsPacket.getGameMode())) {
+            return;
+        }
 
         int blueSchemElo = SchemElo.getElo(fightEndsPacket.getBlueSchem());
         int redSchemElo = SchemElo.getElo(fightEndsPacket.getRedSchem());
@@ -88,4 +94,25 @@ public class FightEndsHandler implements SpigotHandler {
             UserElo.setElo(player, gameMode, (int) Math.round(playerElo + K * (result - winTeamExpectation) * multiplier));
         }
     }
+
+    private boolean teamComboExistedAlready(List<Integer> bluePlayers, List<Integer> redPlayers, String gameMode) {
+        long time = Timestamp.from(Instant.now()).getTime() - fightRange;
+        int page = 0;
+        do {
+            List<Fight> fightsPage = Fight.getPage(page, 32);
+            if (fightsPage.isEmpty()) {
+                return false;
+            }
+            for (Fight fight : fightsPage) {
+                if (!fight.getGameMode().getSchemType().equals(gameMode)) continue;
+                if (fight.getStartTime().getTime() < time) return false;
+                if (fight.getBluePlayers().stream().map(FightPlayer::getUserID).collect(Collectors.toList()).containsAll(bluePlayers)) {
+                    if (fight.getRedPlayers().stream().map(FightPlayer::getUserID).collect(Collectors.toList()).containsAll(redPlayers)) {
+                        return true;
+                    }
+                }
+            }
+            page++;
+        } while (true);
+    }
 }

From a26e3994a3871fbaf1da8b81ed1925bd13222766 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Fri, 1 Apr 2022 12:23:08 +0200
Subject: [PATCH 04/33] Fix FightEndsHandler

---
 src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
index 47e3f896..f90996fc 100644
--- a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
+++ b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
@@ -104,7 +104,7 @@ public class FightEndsHandler implements SpigotHandler {
                 return false;
             }
             for (Fight fight : fightsPage) {
-                if (!fight.getGameMode().getSchemType().equals(gameMode)) continue;
+                if (!gameMode.equals(fight.getGameMode().getSchemType())) continue;
                 if (fight.getStartTime().getTime() < time) return false;
                 if (fight.getBluePlayers().stream().map(FightPlayer::getUserID).collect(Collectors.toList()).containsAll(bluePlayers)) {
                     if (fight.getRedPlayers().stream().map(FightPlayer::getUserID).collect(Collectors.toList()).containsAll(redPlayers)) {

From afa9b4e533f65f51d9486384a12d53387dfe6d82 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Fri, 1 Apr 2022 12:28:05 +0200
Subject: [PATCH 05/33] Add Replay

---
 src/de/steamwar/bungeecore/sql/Fight.java  |  6 ++---
 src/de/steamwar/bungeecore/sql/Replay.java | 31 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 src/de/steamwar/bungeecore/sql/Replay.java

diff --git a/src/de/steamwar/bungeecore/sql/Fight.java b/src/de/steamwar/bungeecore/sql/Fight.java
index 514946d6..e17dcbfd 100644
--- a/src/de/steamwar/bungeecore/sql/Fight.java
+++ b/src/de/steamwar/bungeecore/sql/Fight.java
@@ -11,7 +11,7 @@ import java.util.stream.Collectors;
 
 public class Fight {
 
-    private static final Statement getPage = new Statement("SELECT f.FightID, f.GameMode, f.Server, f.StartTime, f.BlueLeader, f.RedLeader, (b.NodeId IS NULL OR b.AllowReplay) AND (r.NodeId IS NULL OR r.AllowReplay) AS ReplayAllowed, f.Win, f.Replay IS NOT NULL AS ReplayExists FROM Fight f LEFT OUTER JOIN SchematicNode b ON f.BlueSchem = b.NodeId LEFT OUTER JOIN SchematicNode r ON f.RedSchem = r.NodeId ORDER BY FightID DESC LIMIT ?, ?");
+    private static final Statement getPage = new Statement("SELECT f.FightID, f.GameMode, f.Server, f.StartTime, f.BlueLeader, f.RedLeader, (b.NodeId IS NULL OR b.AllowReplay) AND (r.NodeId IS NULL OR r.AllowReplay) AS ReplayAllowed, f.Win FROM Fight f LEFT OUTER JOIN SchematicNode b ON f.BlueSchem = b.NodeId LEFT OUTER JOIN SchematicNode r ON f.RedSchem = r.NodeId ORDER BY FightID DESC LIMIT ?, ?");
 
     private final int fightID;
     private final String gameMode;
@@ -22,7 +22,6 @@ public class Fight {
     private final int redLeader;
     private final int win;
 
-    private final boolean replayExists;
     private final boolean replayAllowed;
 
     private final List<FightPlayer> bluePlayers = new ArrayList<>();
@@ -37,7 +36,6 @@ public class Fight {
         redLeader = rs.getInt("RedLeader");
         replayAllowed = rs.getBoolean("ReplayAllowed");
         win = rs.getInt("Win");
-        replayExists = rs.getBoolean("ReplayExists");
     }
 
     private void initPlayers(List<FightPlayer> fightPlayers) {
@@ -118,6 +116,6 @@ public class Fight {
     }
 
     public boolean replayExists() {
-        return replayExists && getGameMode() != null;
+        return Replay.hasReplay(fightID) && getGameMode() != null;
     }
 }
diff --git a/src/de/steamwar/bungeecore/sql/Replay.java b/src/de/steamwar/bungeecore/sql/Replay.java
new file mode 100644
index 00000000..6c0bab2c
--- /dev/null
+++ b/src/de/steamwar/bungeecore/sql/Replay.java
@@ -0,0 +1,31 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bungeecore.sql;
+
+import java.sql.ResultSet;
+
+public class Replay {
+
+    private static final Statement hasReplay = new Statement("SELECT * FROM Replay WHERE id = ?");
+
+    public static boolean hasReplay(int id) {
+        return hasReplay.select(ResultSet::next, id);
+    }
+}

From 8ce2b9ab71e354f0a140ec2301da9c0be584a71e Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Fri, 1 Apr 2022 13:11:48 +0200
Subject: [PATCH 06/33] Fix FightEndsHandler.fightRange

---
 src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
index f90996fc..62c7a870 100644
--- a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
+++ b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
 public class FightEndsHandler implements SpigotHandler {
 
     private int K = 20;
-    private long fightRange = 1000 /* Milliseconds */ * 60 /* Seconds */ * 30 /* Minutes */;
+    private long fightRange = 1000 /* Milliseconds */ * 60 /* Seconds */ * 15L /* Minutes */;
 
     @Override
     public void handle(ByteArrayDataInput in, ServerInfo info) {

From b5528a6c602bb74956c2f11a2ee7a1b44cb1270b Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Fri, 1 Apr 2022 13:26:05 +0200
Subject: [PATCH 07/33] Update some stuff

---
 .../comms/handlers/FightEndsHandler.java          | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
index 62c7a870..9b28bed4 100644
--- a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
+++ b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
@@ -82,19 +82,26 @@ public class FightEndsHandler implements SpigotHandler {
     }
 
     private void calculateEloOfTeam(int schemId, int eloSchemOwn, int eloSchemEnemy, int eloTeamOwn, int eloTeamEnemy, double result, List<Integer> players, String gameMode, boolean noPlayerRank) {
-        double winSchemExpectation = 1 / (1 + Math.pow(10, (eloSchemEnemy - eloSchemOwn) / 600f));
+        double winSchemExpectation = calsWinExpectation(eloSchemOwn, eloSchemEnemy);
         SchemElo.setElo(schemId, (int) Math.round(eloSchemOwn + K * (result - winSchemExpectation)));
 
         if (noPlayerRank) return;
-        double winTeamExpectation = 1 / (1 + Math.pow(10, (eloTeamEnemy - eloTeamOwn) / 600f));
+        double winTeamExpectation = calsWinExpectation(eloTeamOwn, eloTeamEnemy);
         for (int player : players) {
             int playerElo = UserElo.getEloOrDefault(player, gameMode);
             int fights = UserElo.getFightsOfSeason(player, gameMode);
-            double multiplier = Math.max(1.2 - (fights / 200.0), 0.8);
-            UserElo.setElo(player, gameMode, (int) Math.round(playerElo + K * (result - winTeamExpectation) * multiplier));
+            UserElo.setElo(player, gameMode, (int) Math.round(playerElo + getK(fights) * (result - winTeamExpectation)));
         }
     }
 
+    private double calsWinExpectation(int eloOwn, int eloEnemy) {
+        return 1 / (1 + Math.pow(10, (eloEnemy - eloOwn) / 600f));
+    }
+
+    private double getK(int fights) {
+        return K * Math.max(1.2 - (fights / 200.0), 0.8);
+    }
+
     private boolean teamComboExistedAlready(List<Integer> bluePlayers, List<Integer> redPlayers, String gameMode) {
         long time = Timestamp.from(Instant.now()).getTime() - fightRange;
         int page = 0;

From 200c8eb17e5cfef89c0faa73db60bc9ecd1867bb Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Fri, 1 Apr 2022 15:13:22 +0200
Subject: [PATCH 08/33] Update some stuff

---
 .../bungeecore/comms/handlers/FightEndsHandler.java    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
index 9b28bed4..9e58dcc7 100644
--- a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
+++ b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
@@ -28,13 +28,19 @@ import net.md_5.bungee.api.config.ServerInfo;
 
 import java.sql.Timestamp;
 import java.time.Instant;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 public class FightEndsHandler implements SpigotHandler {
 
     private int K = 20;
-    private long fightRange = 1000 /* Milliseconds */ * 60 /* Seconds */ * 15L /* Minutes */;
+    private long defaultFightRange = 1000 /* Milliseconds */ * 60 /* Seconds */ * 15L /* Minutes */;
+    private Map<String, Long> fightRanges = new HashMap<>();
+    {
+        fightRanges.put("miniwargear", 1000 /* Milliseconds */ * 60 /* Seconds */ * 10L /* Minutes */);
+    }
 
     @Override
     public void handle(ByteArrayDataInput in, ServerInfo info) {
@@ -103,7 +109,7 @@ public class FightEndsHandler implements SpigotHandler {
     }
 
     private boolean teamComboExistedAlready(List<Integer> bluePlayers, List<Integer> redPlayers, String gameMode) {
-        long time = Timestamp.from(Instant.now()).getTime() - fightRange;
+        long time = Timestamp.from(Instant.now()).getTime() - fightRanges.getOrDefault(gameMode, defaultFightRange);
         int page = 0;
         do {
             List<Fight> fightsPage = Fight.getPage(page, 32);

From 738189593dd8b97a8b142d0862896755b9295338 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Fri, 1 Apr 2022 15:31:45 +0200
Subject: [PATCH 09/33] Update some stuff

---
 .../bungeecore/comms/handlers/FightEndsHandler.java      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
index 9e58dcc7..4f0f2c37 100644
--- a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
+++ b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
@@ -31,6 +31,7 @@ import java.time.Instant;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 public class FightEndsHandler implements SpigotHandler {
@@ -38,6 +39,7 @@ public class FightEndsHandler implements SpigotHandler {
     private int K = 20;
     private long defaultFightRange = 1000 /* Milliseconds */ * 60 /* Seconds */ * 15L /* Minutes */;
     private Map<String, Long> fightRanges = new HashMap<>();
+
     {
         fightRanges.put("miniwargear", 1000 /* Milliseconds */ * 60 /* Seconds */ * 10L /* Minutes */);
     }
@@ -73,6 +75,13 @@ public class FightEndsHandler implements SpigotHandler {
             blueResult = 0;
         }
 
+        Set<Integer> teamsIds = fightEndsPacket.getBluePlayers().stream().map(SteamwarUser::get).map(SteamwarUser::getTeam).collect(Collectors.toSet());
+        for (int redPlayer : fightEndsPacket.getRedPlayers()) {
+            if (teamsIds.contains(SteamwarUser.get(redPlayer).getTeam())) {
+                return;
+            }
+        }
+
         if (teamComboExistedAlready(fightEndsPacket.getBluePlayers(), fightEndsPacket.getRedPlayers(), fightEndsPacket.getGameMode())) {
             return;
         }

From c4523521f70b6c02f0bf5086d8755734d3036433 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Fri, 1 Apr 2022 15:57:42 +0200
Subject: [PATCH 10/33] Update some stuff

---
 src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
index 4f0f2c37..cda77372 100644
--- a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
+++ b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
@@ -114,7 +114,7 @@ public class FightEndsHandler implements SpigotHandler {
     }
 
     private double getK(int fights) {
-        return K * Math.max(1.2 - (fights / 200.0), 0.8);
+        return K * Math.max(1.3 - (fights / 200.0), 0.8);
     }
 
     private boolean teamComboExistedAlready(List<Integer> bluePlayers, List<Integer> redPlayers, String gameMode) {

From c2219dec4e53cbce621181288b97c401806bb9b6 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Mon, 4 Apr 2022 18:23:18 +0200
Subject: [PATCH 11/33] Update stuff

---
 .../bungeecore/comms/handlers/FightEndsHandler.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
index cda77372..7392d042 100644
--- a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
+++ b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
@@ -128,10 +128,15 @@ public class FightEndsHandler implements SpigotHandler {
             for (Fight fight : fightsPage) {
                 if (!gameMode.equals(fight.getGameMode().getSchemType())) continue;
                 if (fight.getStartTime().getTime() < time) return false;
-                if (fight.getBluePlayers().stream().map(FightPlayer::getUserID).collect(Collectors.toList()).containsAll(bluePlayers)) {
-                    if (fight.getRedPlayers().stream().map(FightPlayer::getUserID).collect(Collectors.toList()).containsAll(redPlayers)) {
-                        return true;
-                    }
+                if (fight.getBluePlayers().stream()
+                        .map(FightPlayer::getUserID)
+                        .collect(Collectors.toList())
+                        .containsAll(bluePlayers)
+                    && fight.getRedPlayers().stream()
+                        .map(FightPlayer::getUserID)
+                        .collect(Collectors.toList())
+                        .containsAll(redPlayers)) {
+                    return true;
                 }
             }
             page++;

From 350ac8b66fc5179deabec9ecca815ca62f0d161a Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Mon, 4 Apr 2022 20:00:21 +0200
Subject: [PATCH 12/33] Update some stuff

---
 .../comms/handlers/FightEndsHandler.java      | 63 ++++++++++---------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
index 7392d042..f86eacf6 100644
--- a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
+++ b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
@@ -24,18 +24,16 @@ import de.steamwar.bungeecore.ArenaMode;
 import de.steamwar.bungeecore.comms.SpigotHandler;
 import de.steamwar.bungeecore.comms.packets.FightEndsPacket;
 import de.steamwar.bungeecore.sql.*;
+import lombok.RequiredArgsConstructor;
 import net.md_5.bungee.api.config.ServerInfo;
 
-import java.sql.Timestamp;
-import java.time.Instant;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class FightEndsHandler implements SpigotHandler {
 
+    private Map<String, List<Game>> gameModeGames = new HashMap<>();
+
     private int K = 20;
     private long defaultFightRange = 1000 /* Milliseconds */ * 60 /* Seconds */ * 15L /* Minutes */;
     private Map<String, Long> fightRanges = new HashMap<>();
@@ -82,8 +80,12 @@ public class FightEndsHandler implements SpigotHandler {
             }
         }
 
-        if (teamComboExistedAlready(fightEndsPacket.getBluePlayers(), fightEndsPacket.getRedPlayers(), fightEndsPacket.getGameMode())) {
-            return;
+        try {
+            if (teamComboExistedAlready(fightEndsPacket.getBluePlayers(), fightEndsPacket.getRedPlayers(), fightEndsPacket.getGameMode())) {
+                return;
+            }
+        } finally {
+            gameModeGames.computeIfAbsent(fightEndsPacket.getGameMode(), s -> new ArrayList<>()).add(new Game(fightEndsPacket.getBluePlayers(), fightEndsPacket.getRedPlayers()));
         }
 
         int blueSchemElo = SchemElo.getElo(fightEndsPacket.getBlueSchem());
@@ -118,28 +120,27 @@ public class FightEndsHandler implements SpigotHandler {
     }
 
     private boolean teamComboExistedAlready(List<Integer> bluePlayers, List<Integer> redPlayers, String gameMode) {
-        long time = Timestamp.from(Instant.now()).getTime() - fightRanges.getOrDefault(gameMode, defaultFightRange);
-        int page = 0;
-        do {
-            List<Fight> fightsPage = Fight.getPage(page, 32);
-            if (fightsPage.isEmpty()) {
-                return false;
-            }
-            for (Fight fight : fightsPage) {
-                if (!gameMode.equals(fight.getGameMode().getSchemType())) continue;
-                if (fight.getStartTime().getTime() < time) return false;
-                if (fight.getBluePlayers().stream()
-                        .map(FightPlayer::getUserID)
-                        .collect(Collectors.toList())
-                        .containsAll(bluePlayers)
-                    && fight.getRedPlayers().stream()
-                        .map(FightPlayer::getUserID)
-                        .collect(Collectors.toList())
-                        .containsAll(redPlayers)) {
-                    return true;
-                }
-            }
-            page++;
-        } while (true);
+        if (!gameModeGames.containsKey(gameMode)) {
+            return false;
+        }
+        List<Game> games = gameModeGames.get(gameMode);
+        long lifetime = fightRanges.getOrDefault(gameMode, defaultFightRange);
+        games.removeIf(game -> game.livedMillis() > lifetime);
+        return games.stream().anyMatch(game -> game.isSame(bluePlayers, redPlayers));
+    }
+
+    @RequiredArgsConstructor
+    private static class Game {
+        private long time = System.currentTimeMillis();
+        private final List<Integer> bluePlayers;
+        private final List<Integer> redPlayers;
+
+        public long livedMillis() {
+            return System.currentTimeMillis() - time;
+        }
+
+        public boolean isSame(List<Integer> bluePlayers, List<Integer> redPlayers) {
+            return bluePlayers.containsAll(this.bluePlayers) && redPlayers.containsAll(this.redPlayers);
+        }
     }
 }

From 39926d8767b4986956384bb30a1cc22239dd8349 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaoscaot444@gmail.com>
Date: Mon, 4 Apr 2022 22:59:30 +0200
Subject: [PATCH 13/33] :art: Yeet

---
 .../bot/util/DiscordTicketMessage.java         | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/de/steamwar/bungeecore/bot/util/DiscordTicketMessage.java b/src/de/steamwar/bungeecore/bot/util/DiscordTicketMessage.java
index ea6cea39..21ebded9 100644
--- a/src/de/steamwar/bungeecore/bot/util/DiscordTicketMessage.java
+++ b/src/de/steamwar/bungeecore/bot/util/DiscordTicketMessage.java
@@ -20,6 +20,7 @@
 package de.steamwar.bungeecore.bot.util;
 
 import de.steamwar.bungeecore.bot.SteamwarDiscordBot;
+import de.steamwar.bungeecore.bot.config.DiscordTicketType;
 import de.steamwar.bungeecore.bot.config.SteamwarDiscordBotConfig;
 import lombok.experimental.UtilityClass;
 import net.dv8tion.jda.api.EmbedBuilder;
@@ -32,6 +33,7 @@ import net.dv8tion.jda.api.interactions.components.Button;
 import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @UtilityClass
 public class DiscordTicketMessage {
@@ -49,16 +51,26 @@ public class DiscordTicketMessage {
         builder.setTitle("Steamwar-Tickets");
         builder.setColor(Color.RED);
 
-        List<Button> buttons = new ArrayList<>();
-        SteamwarDiscordBotConfig.TICKET_TYPES.forEach((s, discordTicketType) -> buttons.add(discordTicketType.toButton()));
+        List<List<Button>> buttons = new ArrayList<>();
+        chunked(new ArrayList<>(SteamwarDiscordBotConfig.TICKET_TYPES.values()), 5).forEach(discordTicketTypes -> {
+            buttons.add(discordTicketTypes.stream().map(DiscordTicketType::toButton).collect(Collectors.toList()));
+        });
 
         MessageBuilder messageBuilder = new MessageBuilder();
         messageBuilder.setEmbeds(builder.build());
-        messageBuilder.setActionRows(ActionRow.of(buttons));
+        messageBuilder.setActionRows(buttons.stream().map(ActionRow::of).collect(Collectors.toList()));
         if (message != null) {
             message.editMessage(messageBuilder.build()).queue();
         } else {
             channel.sendMessage(messageBuilder.build()).queue();
         }
     }
+
+    private static <T> List<List<T>> chunked(List<T> list, int chunkSize) {
+        List<List<T>> chunks = new ArrayList<>();
+        for (int i = 0; i < list.size(); i += chunkSize) {
+            chunks.add(list.subList(i, Math.min(i + chunkSize, list.size())));
+        }
+        return chunks;
+    }
 }

From c05a2e4ae64805bf7c146fba19fa9d4582489d0a Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Tue, 5 Apr 2022 19:24:04 +0200
Subject: [PATCH 14/33] Update some stuff

---
 .../bungeecore/listeners/mods/Fabric.java     | 29 ++++++++++++++++++-
 .../listeners/mods/ModLoaderBlocker.java      |  1 +
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/de/steamwar/bungeecore/listeners/mods/Fabric.java b/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
index 825d80ed..7973fd12 100644
--- a/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
+++ b/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
@@ -19,7 +19,10 @@
 
 package de.steamwar.bungeecore.listeners.mods;
 
-import com.google.gson.*;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonSyntaxException;
 import de.steamwar.bungeecore.BungeeCore;
 import de.steamwar.bungeecore.Message;
 import de.steamwar.bungeecore.Storage;
@@ -27,8 +30,10 @@ import de.steamwar.bungeecore.listeners.BasicListener;
 import de.steamwar.bungeecore.sql.Mod;
 import de.steamwar.bungeecore.sql.Punishment;
 import de.steamwar.bungeecore.sql.SteamwarUser;
+import net.md_5.bungee.BungeeCord;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.PluginMessageEvent;
+import net.md_5.bungee.api.event.ServerSwitchEvent;
 import net.md_5.bungee.event.EventHandler;
 
 import java.nio.charset.StandardCharsets;
@@ -36,6 +41,7 @@ import java.nio.charset.UnsupportedCharsetException;
 import java.sql.Timestamp;
 import java.time.Instant;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 
 public class Fabric extends BasicListener {
@@ -43,12 +49,22 @@ public class Fabric extends BasicListener {
     private final Set<String> neededMods = new HashSet<>();
 
     public static final Map<ProxiedPlayer, Integer> checkedPlayers = new HashMap<>();
+    public static final Map<ProxiedPlayer, Long> expectPluginMessage = new HashMap<>();
 
     {
         neededMods.add("java");
         neededMods.add("minecraft");
         neededMods.add("fabricloader");
         neededMods.add("steamwarmodsender");
+
+        BungeeCord.getInstance().getScheduler().schedule(BungeeCore.get(), () -> {
+            for (Map.Entry<ProxiedPlayer, Long> entry : expectPluginMessage.entrySet()) {
+                if (System.currentTimeMillis() - entry.getValue() > TimeUnit.SECONDS.toMillis(20)) {
+                    banPlayer(SteamwarUser.get(entry.getKey()), entry.getKey());
+                    return;
+                }
+            }
+        }, 0, 1, TimeUnit.SECONDS);
     }
 
     @EventHandler
@@ -63,6 +79,11 @@ public class Fabric extends BasicListener {
         ProxiedPlayer player = (ProxiedPlayer) e.getSender();
         SteamwarUser user = SteamwarUser.get(player.getUniqueId());
 
+        if (expectPluginMessage.containsKey(player) && !checkedPlayers.containsKey(player)) {
+            banPlayer(user, player);
+            return;
+        }
+
         List<Mod> mods = new LinkedList<>();
 
         byte[] data = e.getData();
@@ -124,6 +145,12 @@ public class Fabric extends BasicListener {
         }
     }
 
+    @EventHandler
+    public void onServerSwitchEvent(ServerSwitchEvent e) {
+        if (e.getFrom() == null) return;
+        expectPluginMessage.put(e.getPlayer(), System.currentTimeMillis());
+    }
+
     private boolean isSortedAlphabetically(List<Mod> mods) {
         boolean isSorted = true;
         for(int i = 0; i < mods.size() - 1; i++) {
diff --git a/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java b/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java
index 134c7f8d..00e076ef 100644
--- a/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java
+++ b/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java
@@ -59,6 +59,7 @@ public class ModLoaderBlocker extends BasicListener {
     @EventHandler
     public void onDisconnect(PlayerDisconnectEvent e){
         Fabric.checkedPlayers.remove(e.getPlayer());
+        Fabric.expectPluginMessage.remove(e.getPlayer());
         Storage.fabricPlayers.remove(e.getPlayer());
     }
 

From ac8bcdd98732fa3b81f7984cb991410b40720857 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Tue, 5 Apr 2022 19:40:08 +0200
Subject: [PATCH 15/33] Update stuff

---
 src/de/steamwar/bungeecore/listeners/mods/Fabric.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/de/steamwar/bungeecore/listeners/mods/Fabric.java b/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
index 7973fd12..da57be81 100644
--- a/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
+++ b/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
@@ -59,6 +59,9 @@ public class Fabric extends BasicListener {
 
         BungeeCord.getInstance().getScheduler().schedule(BungeeCore.get(), () -> {
             for (Map.Entry<ProxiedPlayer, Long> entry : expectPluginMessage.entrySet()) {
+                if (!BungeeCord.getInstance().getPlayers().contains(entry.getKey())) {
+                    continue;
+                }
                 if (System.currentTimeMillis() - entry.getValue() > TimeUnit.SECONDS.toMillis(20)) {
                     banPlayer(SteamwarUser.get(entry.getKey()), entry.getKey());
                     return;

From 3af6f43ccd9efbf1fba67f221827a9b26c5ed5b0 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Tue, 5 Apr 2022 19:40:50 +0200
Subject: [PATCH 16/33] Revert some stuff

---
 src/de/steamwar/bungeecore/listeners/mods/Fabric.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/de/steamwar/bungeecore/listeners/mods/Fabric.java b/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
index da57be81..7973fd12 100644
--- a/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
+++ b/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
@@ -59,9 +59,6 @@ public class Fabric extends BasicListener {
 
         BungeeCord.getInstance().getScheduler().schedule(BungeeCore.get(), () -> {
             for (Map.Entry<ProxiedPlayer, Long> entry : expectPluginMessage.entrySet()) {
-                if (!BungeeCord.getInstance().getPlayers().contains(entry.getKey())) {
-                    continue;
-                }
                 if (System.currentTimeMillis() - entry.getValue() > TimeUnit.SECONDS.toMillis(20)) {
                     banPlayer(SteamwarUser.get(entry.getKey()), entry.getKey());
                     return;

From 7b5ce77e934aedc5c18c693a3b76d2e686ef9cbd Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Tue, 5 Apr 2022 19:47:08 +0200
Subject: [PATCH 17/33] Revert some stuff

---
 .../bungeecore/listeners/mods/Fabric.java     | 37 ++++++++++++++-----
 .../listeners/mods/ModLoaderBlocker.java      |  4 +-
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/de/steamwar/bungeecore/listeners/mods/Fabric.java b/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
index 7973fd12..e683040e 100644
--- a/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
+++ b/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
@@ -48,8 +48,10 @@ public class Fabric extends BasicListener {
 
     private final Set<String> neededMods = new HashSet<>();
 
-    public static final Map<ProxiedPlayer, Integer> checkedPlayers = new HashMap<>();
-    public static final Map<ProxiedPlayer, Long> expectPluginMessage = new HashMap<>();
+    private static final Map<ProxiedPlayer, Integer> checkedPlayers = new HashMap<>();
+    private static final Map<ProxiedPlayer, Long> expectPluginMessage = new HashMap<>();
+
+    private static final Object OBJECT = new Object();
 
     {
         neededMods.add("java");
@@ -58,10 +60,12 @@ public class Fabric extends BasicListener {
         neededMods.add("steamwarmodsender");
 
         BungeeCord.getInstance().getScheduler().schedule(BungeeCore.get(), () -> {
-            for (Map.Entry<ProxiedPlayer, Long> entry : expectPluginMessage.entrySet()) {
-                if (System.currentTimeMillis() - entry.getValue() > TimeUnit.SECONDS.toMillis(20)) {
-                    banPlayer(SteamwarUser.get(entry.getKey()), entry.getKey());
-                    return;
+            synchronized (OBJECT) {
+                for (Map.Entry<ProxiedPlayer, Long> entry : expectPluginMessage.entrySet()) {
+                    if (System.currentTimeMillis() - entry.getValue() > TimeUnit.SECONDS.toMillis(20)) {
+                        banPlayer(SteamwarUser.get(entry.getKey()), entry.getKey());
+                        return;
+                    }
                 }
             }
         }, 0, 1, TimeUnit.SECONDS);
@@ -79,9 +83,13 @@ public class Fabric extends BasicListener {
         ProxiedPlayer player = (ProxiedPlayer) e.getSender();
         SteamwarUser user = SteamwarUser.get(player.getUniqueId());
 
-        if (expectPluginMessage.containsKey(player) && !checkedPlayers.containsKey(player)) {
-            banPlayer(user, player);
-            return;
+        if (!checkedPlayers.containsKey(player)) {
+            synchronized (OBJECT) {
+                if (expectPluginMessage.containsKey(player)) {
+                    banPlayer(user, player);
+                    return;
+                }
+            }
         }
 
         List<Mod> mods = new LinkedList<>();
@@ -148,7 +156,9 @@ public class Fabric extends BasicListener {
     @EventHandler
     public void onServerSwitchEvent(ServerSwitchEvent e) {
         if (e.getFrom() == null) return;
-        expectPluginMessage.put(e.getPlayer(), System.currentTimeMillis());
+        synchronized (OBJECT) {
+            expectPluginMessage.put(e.getPlayer(), System.currentTimeMillis());
+        }
     }
 
     private boolean isSortedAlphabetically(List<Mod> mods) {
@@ -177,4 +187,11 @@ public class Fabric extends BasicListener {
                 true);
         BungeeCore.log(Level.SEVERE,Message.parse("MODIFICATION_BAN_LOG", player, user.getUserName()));
     }
+
+    public static void remove(ProxiedPlayer player) {
+        synchronized (OBJECT) {
+            checkedPlayers.remove(player);
+            expectPluginMessage.remove(player);
+        }
+    }
 }
diff --git a/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java b/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java
index 00e076ef..286ab013 100644
--- a/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java
+++ b/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java
@@ -28,7 +28,6 @@ import net.md_5.bungee.api.event.PluginMessageEvent;
 import net.md_5.bungee.api.event.ServerSwitchEvent;
 import net.md_5.bungee.event.EventHandler;
 
-import java.nio.charset.StandardCharsets;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -58,8 +57,7 @@ public class ModLoaderBlocker extends BasicListener {
 
     @EventHandler
     public void onDisconnect(PlayerDisconnectEvent e){
-        Fabric.checkedPlayers.remove(e.getPlayer());
-        Fabric.expectPluginMessage.remove(e.getPlayer());
+        Fabric.remove(e.getPlayer());
         Storage.fabricPlayers.remove(e.getPlayer());
     }
 

From 6b8d46d75a7bd69381fa62295c779b48d2aa8546 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Tue, 5 Apr 2022 19:47:48 +0200
Subject: [PATCH 18/33] Revert some stuff

---
 .../steamwar/bungeecore/listeners/mods/Fabric.java   | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/de/steamwar/bungeecore/listeners/mods/Fabric.java b/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
index e683040e..7df5be60 100644
--- a/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
+++ b/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
@@ -51,8 +51,6 @@ public class Fabric extends BasicListener {
     private static final Map<ProxiedPlayer, Integer> checkedPlayers = new HashMap<>();
     private static final Map<ProxiedPlayer, Long> expectPluginMessage = new HashMap<>();
 
-    private static final Object OBJECT = new Object();
-
     {
         neededMods.add("java");
         neededMods.add("minecraft");
@@ -60,7 +58,7 @@ public class Fabric extends BasicListener {
         neededMods.add("steamwarmodsender");
 
         BungeeCord.getInstance().getScheduler().schedule(BungeeCore.get(), () -> {
-            synchronized (OBJECT) {
+            synchronized (expectPluginMessage) {
                 for (Map.Entry<ProxiedPlayer, Long> entry : expectPluginMessage.entrySet()) {
                     if (System.currentTimeMillis() - entry.getValue() > TimeUnit.SECONDS.toMillis(20)) {
                         banPlayer(SteamwarUser.get(entry.getKey()), entry.getKey());
@@ -84,7 +82,7 @@ public class Fabric extends BasicListener {
         SteamwarUser user = SteamwarUser.get(player.getUniqueId());
 
         if (!checkedPlayers.containsKey(player)) {
-            synchronized (OBJECT) {
+            synchronized (expectPluginMessage) {
                 if (expectPluginMessage.containsKey(player)) {
                     banPlayer(user, player);
                     return;
@@ -156,7 +154,7 @@ public class Fabric extends BasicListener {
     @EventHandler
     public void onServerSwitchEvent(ServerSwitchEvent e) {
         if (e.getFrom() == null) return;
-        synchronized (OBJECT) {
+        synchronized (expectPluginMessage) {
             expectPluginMessage.put(e.getPlayer(), System.currentTimeMillis());
         }
     }
@@ -189,8 +187,8 @@ public class Fabric extends BasicListener {
     }
 
     public static void remove(ProxiedPlayer player) {
-        synchronized (OBJECT) {
-            checkedPlayers.remove(player);
+        checkedPlayers.remove(player);
+        synchronized (expectPluginMessage) {
             expectPluginMessage.remove(player);
         }
     }

From 4c9ac4a98470500512d6380c09efd38f231d7595 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Tue, 5 Apr 2022 19:50:41 +0200
Subject: [PATCH 19/33] Revert some stuff

---
 src/de/steamwar/bungeecore/listeners/mods/Fabric.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/de/steamwar/bungeecore/listeners/mods/Fabric.java b/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
index 7df5be60..10ecd9f1 100644
--- a/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
+++ b/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
@@ -60,6 +60,9 @@ public class Fabric extends BasicListener {
         BungeeCord.getInstance().getScheduler().schedule(BungeeCore.get(), () -> {
             synchronized (expectPluginMessage) {
                 for (Map.Entry<ProxiedPlayer, Long> entry : expectPluginMessage.entrySet()) {
+                    if (!checkedPlayers.containsKey(entry.getKey())) {
+                        continue;
+                    }
                     if (System.currentTimeMillis() - entry.getValue() > TimeUnit.SECONDS.toMillis(20)) {
                         banPlayer(SteamwarUser.get(entry.getKey()), entry.getKey());
                         return;
@@ -89,6 +92,7 @@ public class Fabric extends BasicListener {
                 }
             }
         }
+        expectPluginMessage.remove(player);
 
         List<Mod> mods = new LinkedList<>();
 

From 9a0b3a41b909c87a061b56f43e3b86933cdd4ea1 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Wed, 6 Apr 2022 16:59:11 +0200
Subject: [PATCH 20/33] Update some stuff

---
 .../comms/handlers/FightEndsHandler.java           | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
index f86eacf6..03fae605 100644
--- a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
+++ b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
@@ -32,14 +32,18 @@ import java.util.stream.Collectors;
 
 public class FightEndsHandler implements SpigotHandler {
 
-    private Map<String, List<Game>> gameModeGames = new HashMap<>();
+    private Map<String, LinkedList<Game>> gameModeGames = new HashMap<>();
 
     private int K = 20;
+
     private long defaultFightRange = 1000 /* Milliseconds */ * 60 /* Seconds */ * 15L /* Minutes */;
     private Map<String, Long> fightRanges = new HashMap<>();
+    private long defaultFightCount = 1;
+    private Map<String, Long> fightCounts = new HashMap<>();
 
     {
-        fightRanges.put("miniwargear", 1000 /* Milliseconds */ * 60 /* Seconds */ * 10L /* Minutes */);
+        fightRanges.put("miniwargear", 1000 /* Milliseconds */ * 60 /* Seconds */ * 30L /* Minutes */);
+        fightCounts.put("miniwargear", 3L);
     }
 
     @Override
@@ -73,6 +77,8 @@ public class FightEndsHandler implements SpigotHandler {
             blueResult = 0;
         }
 
+        // Die nächsten Zeilen filtern ein Fight innerhalb eines Teams nicht gewertet wird, bzw auch wenn nur Teile beider Teams im
+        // gleichen Team sind dieser ungewertet ist.
         Set<Integer> teamsIds = fightEndsPacket.getBluePlayers().stream().map(SteamwarUser::get).map(SteamwarUser::getTeam).collect(Collectors.toSet());
         for (int redPlayer : fightEndsPacket.getRedPlayers()) {
             if (teamsIds.contains(SteamwarUser.get(redPlayer).getTeam())) {
@@ -85,7 +91,7 @@ public class FightEndsHandler implements SpigotHandler {
                 return;
             }
         } finally {
-            gameModeGames.computeIfAbsent(fightEndsPacket.getGameMode(), s -> new ArrayList<>()).add(new Game(fightEndsPacket.getBluePlayers(), fightEndsPacket.getRedPlayers()));
+            gameModeGames.computeIfAbsent(fightEndsPacket.getGameMode(), s -> new LinkedList<>()).add(new Game(fightEndsPacket.getBluePlayers(), fightEndsPacket.getRedPlayers()));
         }
 
         int blueSchemElo = SchemElo.getElo(fightEndsPacket.getBlueSchem());
@@ -126,7 +132,7 @@ public class FightEndsHandler implements SpigotHandler {
         List<Game> games = gameModeGames.get(gameMode);
         long lifetime = fightRanges.getOrDefault(gameMode, defaultFightRange);
         games.removeIf(game -> game.livedMillis() > lifetime);
-        return games.stream().anyMatch(game -> game.isSame(bluePlayers, redPlayers));
+        return games.stream().filter(game -> game.isSame(bluePlayers, redPlayers)).count() > fightCounts.getOrDefault(gameMode, defaultFightCount);
     }
 
     @RequiredArgsConstructor

From 169d26852c9b902193caa4f231af982fff114769 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Wed, 6 Apr 2022 17:01:33 +0200
Subject: [PATCH 21/33] Update some stuff

---
 .../bungeecore/comms/handlers/FightEndsHandler.java   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
index 03fae605..b9a7492c 100644
--- a/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
+++ b/src/de/steamwar/bungeecore/comms/handlers/FightEndsHandler.java
@@ -129,9 +129,16 @@ public class FightEndsHandler implements SpigotHandler {
         if (!gameModeGames.containsKey(gameMode)) {
             return false;
         }
-        List<Game> games = gameModeGames.get(gameMode);
+        LinkedList<Game> games = gameModeGames.get(gameMode);
         long lifetime = fightRanges.getOrDefault(gameMode, defaultFightRange);
-        games.removeIf(game -> game.livedMillis() > lifetime);
+        while (!games.isEmpty()) {
+            Game game = games.getFirst();
+            if (game.livedMillis() > lifetime) {
+                games.removeFirst();
+            } else {
+                break;
+            }
+        }
         return games.stream().filter(game -> game.isSame(bluePlayers, redPlayers)).count() > fightCounts.getOrDefault(gameMode, defaultFightCount);
     }
 

From c367f1112063b8f08eff6ef1b026d6b412b6b700 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Wed, 6 Apr 2022 20:19:38 +0200
Subject: [PATCH 22/33] Update some stuff

---
 .../steamwar/bungeecore/listeners/mods/Fabric.java   |  2 +-
 .../bungeecore/listeners/mods/ModLoaderBlocker.java  | 12 ++++++++----
 src/de/steamwar/messages/BungeeCore.properties       |  1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/de/steamwar/bungeecore/listeners/mods/Fabric.java b/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
index 10ecd9f1..ea1e2f9b 100644
--- a/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
+++ b/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
@@ -48,7 +48,7 @@ public class Fabric extends BasicListener {
 
     private final Set<String> neededMods = new HashSet<>();
 
-    private static final Map<ProxiedPlayer, Integer> checkedPlayers = new HashMap<>();
+    public static final Map<ProxiedPlayer, Integer> checkedPlayers = new HashMap<>();
     private static final Map<ProxiedPlayer, Long> expectPluginMessage = new HashMap<>();
 
     {
diff --git a/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java b/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java
index 286ab013..9965c3e6 100644
--- a/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java
+++ b/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java
@@ -46,12 +46,16 @@ public class ModLoaderBlocker extends BasicListener {
 
         if(new String(e.getData()).contains("fabric")){
             ProxiedPlayer p = (ProxiedPlayer) sender;
-            Storage.fabricPlayers.add(p);
-            Message.send("MODLOADER_INSTALLED", p, "Fabric");
+            if (!Fabric.checkedPlayers.containsKey(p) && !Storage.fabricPlayers.contains(p)) {
+                Storage.fabricPlayers.add(p);
+                Message.send("MODLOADER_INSTALLED_FABRIC", p, "Fabric");
+            }
         }else if(new String(e.getData()).contains("LiteLoader")) {
             ProxiedPlayer p = (ProxiedPlayer) sender;
-            Storage.fabricPlayers.add(p);
-            Message.send("MODLOADER_INSTALLED", p, "LiteLoader");
+            if (!Storage.fabricPlayers.contains(p)) {
+                Storage.fabricPlayers.add(p);
+                Message.send("MODLOADER_INSTALLED", p, "LiteLoader");
+            }
         }
     }
 
diff --git a/src/de/steamwar/messages/BungeeCore.properties b/src/de/steamwar/messages/BungeeCore.properties
index 8542153a..e985aaaf 100644
--- a/src/de/steamwar/messages/BungeeCore.properties
+++ b/src/de/steamwar/messages/BungeeCore.properties
@@ -14,6 +14,7 @@ DEV_UNKNOWN_SERVER=§cBitte gib einen DevServer an.
 
 #ModLoader blocker
 MODLOADER_INSTALLED=§7Du hast §e{0} §7installiert. Daher kannst du keinen Arenen beitreten.
+MODLOADER_INSTALLED_FABRIC=§7Du hast §e{0} §7installiert. Mit dem SteamWarModSender kannst du Arenen beitreten.
 MODLOADER_DENIED=§cMit Fabric, Forge und LiteLoader kannst du keinen Arenen beitreten.
 
 #Help command

From 4f6bf71f82b751d30524a49ade97b87144e75072 Mon Sep 17 00:00:00 2001
From: Lixfel <agga-games@gmx.de>
Date: Fri, 8 Apr 2022 13:12:00 +0200
Subject: [PATCH 23/33] Fix tp

Signed-off-by: Lixfel <agga-games@gmx.de>
---
 src/de/steamwar/bungeecore/commands/TpCommand.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/de/steamwar/bungeecore/commands/TpCommand.java b/src/de/steamwar/bungeecore/commands/TpCommand.java
index 33bd7bbb..39a46c74 100644
--- a/src/de/steamwar/bungeecore/commands/TpCommand.java
+++ b/src/de/steamwar/bungeecore/commands/TpCommand.java
@@ -90,7 +90,8 @@ public class TpCommand extends BasicCommand {
             return false;
 
         // Check if player is allowed to join fights
-        if (Subserver.getSubserver(server).getType() == Servertype.ARENA) {
+        Subserver subserver = Subserver.getSubserver(server);
+        if (subserver != null && subserver.getType() == Servertype.ARENA) {
             SteamwarUser steamwarUser = SteamwarUser.get(player);
             if (steamwarUser.isPunishedWithMessage(player, Punishment.PunishmentType.NoFightServer)) {
                 return true;

From 1bc5011d4f8a234465502aea63e565177cf0607b Mon Sep 17 00:00:00 2001
From: Lixfel <agga-games@gmx.de>
Date: Fri, 8 Apr 2022 13:21:45 +0200
Subject: [PATCH 24/33] Prevent ProcessingSpam

Signed-off-by: Lixfel <agga-games@gmx.de>
---
 .../bungeecore/inventory/SWInventory.java       | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/de/steamwar/bungeecore/inventory/SWInventory.java b/src/de/steamwar/bungeecore/inventory/SWInventory.java
index b827e884..0d4a8d30 100644
--- a/src/de/steamwar/bungeecore/inventory/SWInventory.java
+++ b/src/de/steamwar/bungeecore/inventory/SWInventory.java
@@ -29,6 +29,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class SWInventory {
 
@@ -39,6 +40,8 @@ public class SWInventory {
     private String title;
     private boolean next;
 
+    private final AtomicBoolean processingClick = new AtomicBoolean();
+
     public SWInventory(ProxiedPlayer proxiedPlayer, int size, String title) {
         itemMap = new HashMap<>();
         InventoryCallbackHandler.inventoryHashMap.put(SteamwarUser.get(proxiedPlayer).getId(), this);
@@ -101,13 +104,19 @@ public class SWInventory {
     }
 
     public void handleCallback(InvCallback.ClickType type, int pos) {
-        itemMap.get(pos).getCallback().clicked(type);
+        if(processingClick.compareAndSet(false, true)) {
+            itemMap.get(pos).getCallback().clicked(type);
+            processingClick.set(false);
+        }
     }
 
     public void handleClose() {
-        InventoryCallbackHandler.inventoryHashMap.remove(SteamwarUser.get(player).getId(), this);
-        if(close != null)
-            close.clicked(null);
+        if(processingClick.compareAndSet(false, true)) {
+            InventoryCallbackHandler.inventoryHashMap.remove(SteamwarUser.get(player).getId(), this);
+            if(close != null)
+                close.clicked(null);
+            processingClick.set(false);
+        }
     }
 
     public void open() {

From eb8a8a2e07d9ef3f5665b0af836f9159beb81586 Mon Sep 17 00:00:00 2001
From: Lixfel <agga-games@gmx.de>
Date: Sat, 9 Apr 2022 16:58:51 +0200
Subject: [PATCH 25/33] Show eventfights as finished immediatly

Signed-off-by: Lixfel <agga-games@gmx.de>
---
 src/de/steamwar/bungeecore/commands/EventCommand.java | 4 +---
 src/de/steamwar/bungeecore/sql/EventFight.java        | 6 ++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/de/steamwar/bungeecore/commands/EventCommand.java b/src/de/steamwar/bungeecore/commands/EventCommand.java
index 79ae6208..c6ed4484 100644
--- a/src/de/steamwar/bungeecore/commands/EventCommand.java
+++ b/src/de/steamwar/bungeecore/commands/EventCommand.java
@@ -29,7 +29,6 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
 
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.Set;
 
@@ -100,7 +99,6 @@ public class EventCommand extends BasicCommand {
         Message.send("EVENT_USAGE", player);
 
         List<EventFight> fights = EventFight.getEvent(currentEvent.getEventID());
-        Instant now = Instant.now();
 
         Message.send("EVENT_CURRENT_EVENT", player, currentEvent.getEventName());
 
@@ -111,7 +109,7 @@ public class EventCommand extends BasicCommand {
             StringBuilder fline = new StringBuilder(Message.parse("EVENT_CURRENT_FIGHT", player, fight.getStartTime().toLocalDateTime().format(timeFormat), blue.getTeamColor(), blue.getTeamKuerzel(),
                     red.getTeamColor(), red.getTeamKuerzel()));
 
-            if(now.isAfter(fight.getStartTime().toInstant().plus(35, ChronoUnit.MINUTES))){
+            if(fight.hasFinished()){
                 switch(fight.getErgebnis()){
                     case 1:
                         fline.append(Message.parse("EVENT_CURRENT_FIGHT_WIN", player, blue.getTeamColor(), blue.getTeamKuerzel()));
diff --git a/src/de/steamwar/bungeecore/sql/EventFight.java b/src/de/steamwar/bungeecore/sql/EventFight.java
index ffcbe6f8..4135b61f 100644
--- a/src/de/steamwar/bungeecore/sql/EventFight.java
+++ b/src/de/steamwar/bungeecore/sql/EventFight.java
@@ -45,6 +45,7 @@ public class EventFight implements Comparable<EventFight> {
     private final int teamRed;
     private final int kampfleiter;
     private final int ergebnis;
+    private final int fight;
 
     private EventFight(ResultSet rs) throws SQLException {
         eventID = rs.getInt("EventID");
@@ -56,6 +57,7 @@ public class EventFight implements Comparable<EventFight> {
         teamRed = rs.getInt("TeamRed");
         kampfleiter = rs.getInt("Kampfleiter");
         ergebnis = rs.getInt("Ergebnis");
+        fight = rs.getInt("Fight");
     }
 
     public void reschedule(){
@@ -122,6 +124,10 @@ public class EventFight implements Comparable<EventFight> {
         return ergebnis;
     }
 
+    public boolean hasFinished() {
+        return fight != 0;
+    }
+
     @Override
     public int hashCode(){
         return fightID;

From 4bdead92b520ef2a02ed3c63d526db7dc48a9ba1 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Sat, 9 Apr 2022 21:30:52 +0200
Subject: [PATCH 26/33] Update some stuff

---
 src/de/steamwar/bungeecore/sql/Fight.java  | 2 +-
 src/de/steamwar/bungeecore/sql/Replay.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/de/steamwar/bungeecore/sql/Fight.java b/src/de/steamwar/bungeecore/sql/Fight.java
index e17dcbfd..4fd0b7d9 100644
--- a/src/de/steamwar/bungeecore/sql/Fight.java
+++ b/src/de/steamwar/bungeecore/sql/Fight.java
@@ -116,6 +116,6 @@ public class Fight {
     }
 
     public boolean replayExists() {
-        return Replay.hasReplay(fightID) && getGameMode() != null;
+        return getGameMode() != null && Replay.hasReplay(fightID);
     }
 }
diff --git a/src/de/steamwar/bungeecore/sql/Replay.java b/src/de/steamwar/bungeecore/sql/Replay.java
index 6c0bab2c..188232a8 100644
--- a/src/de/steamwar/bungeecore/sql/Replay.java
+++ b/src/de/steamwar/bungeecore/sql/Replay.java
@@ -23,7 +23,7 @@ import java.sql.ResultSet;
 
 public class Replay {
 
-    private static final Statement hasReplay = new Statement("SELECT * FROM Replay WHERE id = ?");
+    private static final Statement hasReplay = new Statement("SELECT FightID FROM Replay WHERE FightID = ?");
 
     public static boolean hasReplay(int id) {
         return hasReplay.select(ResultSet::next, id);

From 7a48584cbb2d5440b008eb08c8290f0d33b92a2b Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Sat, 9 Apr 2022 21:36:18 +0200
Subject: [PATCH 27/33] Update some stuff

---
 src/de/steamwar/bungeecore/sql/Replay.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/de/steamwar/bungeecore/sql/Replay.java b/src/de/steamwar/bungeecore/sql/Replay.java
index 188232a8..a4f26514 100644
--- a/src/de/steamwar/bungeecore/sql/Replay.java
+++ b/src/de/steamwar/bungeecore/sql/Replay.java
@@ -23,7 +23,7 @@ import java.sql.ResultSet;
 
 public class Replay {
 
-    private static final Statement hasReplay = new Statement("SELECT FightID FROM Replay WHERE FightID = ?");
+    private static final Statement hasReplay = new Statement("SELECT 1 FROM Replay WHERE FightID = ?");
 
     public static boolean hasReplay(int id) {
         return hasReplay.select(ResultSet::next, id);

From fa5d4ad983463e412bf5178adfee9e32388fa4d8 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Sat, 9 Apr 2022 22:08:17 +0200
Subject: [PATCH 28/33] Update some stuff

---
 src/de/steamwar/bungeecore/sql/Fight.java  |  6 +++--
 src/de/steamwar/bungeecore/sql/Replay.java | 31 ----------------------
 2 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 src/de/steamwar/bungeecore/sql/Replay.java

diff --git a/src/de/steamwar/bungeecore/sql/Fight.java b/src/de/steamwar/bungeecore/sql/Fight.java
index 4fd0b7d9..e13b7872 100644
--- a/src/de/steamwar/bungeecore/sql/Fight.java
+++ b/src/de/steamwar/bungeecore/sql/Fight.java
@@ -11,7 +11,7 @@ import java.util.stream.Collectors;
 
 public class Fight {
 
-    private static final Statement getPage = new Statement("SELECT f.FightID, f.GameMode, f.Server, f.StartTime, f.BlueLeader, f.RedLeader, (b.NodeId IS NULL OR b.AllowReplay) AND (r.NodeId IS NULL OR r.AllowReplay) AS ReplayAllowed, f.Win FROM Fight f LEFT OUTER JOIN SchematicNode b ON f.BlueSchem = b.NodeId LEFT OUTER JOIN SchematicNode r ON f.RedSchem = r.NodeId ORDER BY FightID DESC LIMIT ?, ?");
+    private static final Statement getPage = new Statement("SELECT f.FightID, f.GameMode, f.Server, f.StartTime, f.BlueLeader, f.RedLeader, (b.NodeId IS NULL OR b.AllowReplay) AND (r.NodeId IS NULL OR r.AllowReplay) AS ReplayAllowed, f.Win, (SELECT COUNT(1) FROM Replay WHERE Replay.FightID = f.FightID) as ReplayAvailable FROM Fight f LEFT OUTER JOIN SchematicNode b ON f.BlueSchem = b.NodeId LEFT OUTER JOIN SchematicNode r ON f.RedSchem = r.NodeId ORDER BY FightID DESC LIMIT ?, ?");
 
     private final int fightID;
     private final String gameMode;
@@ -23,6 +23,7 @@ public class Fight {
     private final int win;
 
     private final boolean replayAllowed;
+    private final boolean replayAvailable;
 
     private final List<FightPlayer> bluePlayers = new ArrayList<>();
     private final List<FightPlayer> redPlayers = new ArrayList<>();
@@ -35,6 +36,7 @@ public class Fight {
         blueLeader = rs.getInt("BlueLeader");
         redLeader = rs.getInt("RedLeader");
         replayAllowed = rs.getBoolean("ReplayAllowed");
+        replayAvailable = rs.getBoolean("ReplayAvailable");
         win = rs.getInt("Win");
     }
 
@@ -116,6 +118,6 @@ public class Fight {
     }
 
     public boolean replayExists() {
-        return getGameMode() != null && Replay.hasReplay(fightID);
+        return getGameMode() != null && replayAvailable;
     }
 }
diff --git a/src/de/steamwar/bungeecore/sql/Replay.java b/src/de/steamwar/bungeecore/sql/Replay.java
deleted file mode 100644
index a4f26514..00000000
--- a/src/de/steamwar/bungeecore/sql/Replay.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2020  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bungeecore.sql;
-
-import java.sql.ResultSet;
-
-public class Replay {
-
-    private static final Statement hasReplay = new Statement("SELECT 1 FROM Replay WHERE FightID = ?");
-
-    public static boolean hasReplay(int id) {
-        return hasReplay.select(ResultSet::next, id);
-    }
-}

From 190828692c8bd5969432bef7dafdff88c616af3d Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaoscaot444@gmail.com>
Date: Sun, 10 Apr 2022 19:20:16 +0200
Subject: [PATCH 29/33] :bug: Fixing Punishment Errors

---
 src/de/steamwar/bungeecore/commands/PunishmentCommand.java | 2 +-
 src/de/steamwar/bungeecore/listeners/ChatListener.java     | 2 +-
 src/de/steamwar/bungeecore/listeners/mods/Fabric.java      | 6 ++----
 src/de/steamwar/bungeecore/sql/Punishment.java             | 6 ++++++
 src/de/steamwar/bungeecore/sql/SteamwarUser.java           | 4 ++++
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/de/steamwar/bungeecore/commands/PunishmentCommand.java b/src/de/steamwar/bungeecore/commands/PunishmentCommand.java
index eda5c8b4..ccb6f062 100644
--- a/src/de/steamwar/bungeecore/commands/PunishmentCommand.java
+++ b/src/de/steamwar/bungeecore/commands/PunishmentCommand.java
@@ -92,7 +92,7 @@ public class PunishmentCommand {
 
     public static Timestamp parseTime(CommandSender sender, String arg) {
         if (arg.equalsIgnoreCase("perma")) {
-            return Timestamp.from(Instant.ofEpochSecond(946674800));
+            return Punishment.PERMA_TIME;
         } else {
             SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy_HH:mm");
             try {
diff --git a/src/de/steamwar/bungeecore/listeners/ChatListener.java b/src/de/steamwar/bungeecore/listeners/ChatListener.java
index b8b5cdba..bc851416 100644
--- a/src/de/steamwar/bungeecore/listeners/ChatListener.java
+++ b/src/de/steamwar/bungeecore/listeners/ChatListener.java
@@ -48,7 +48,7 @@ public class ChatListener extends BasicListener {
     public void onChatEvent(ChatEvent e){
         if(e.getMessage().contains("jndi:ldap")) {
             e.setCancelled(true);
-            SteamwarUser.get(((ProxiedPlayer) e.getSender()).getUniqueId()).punish(Punishment.PunishmentType.Ban, Timestamp.from(Instant.ofEpochSecond(946674800)), "Versuchte Exploit-Ausnutzung", 0, true);
+            SteamwarUser.get(((ProxiedPlayer) e.getSender()).getUniqueId()).punishPerma(Punishment.PunishmentType.Ban, "Versuchte Exploit-Ausnutzung", 0);
             return;
         }
 
diff --git a/src/de/steamwar/bungeecore/listeners/mods/Fabric.java b/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
index ea1e2f9b..252aac0e 100644
--- a/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
+++ b/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
@@ -182,11 +182,9 @@ public class Fabric extends BasicListener {
     }
 
     public void banPlayer(SteamwarUser user, ProxiedPlayer player) {
-        user.punish(Punishment.PunishmentType.Ban,
-                Timestamp.from(Instant.now()),
+        user.punishPerma(Punishment.PunishmentType.Ban,
                 Message.parse("MODIFICATION_BAN_MESSAGE", player, user.getUserName(), user.getId()),
-                0,
-                true);
+                0);
         BungeeCore.log(Level.SEVERE,Message.parse("MODIFICATION_BAN_LOG", player, user.getUserName()));
     }
 
diff --git a/src/de/steamwar/bungeecore/sql/Punishment.java b/src/de/steamwar/bungeecore/sql/Punishment.java
index c2344a6c..d53d6e3e 100644
--- a/src/de/steamwar/bungeecore/sql/Punishment.java
+++ b/src/de/steamwar/bungeecore/sql/Punishment.java
@@ -25,6 +25,7 @@ import lombok.Getter;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
+import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
@@ -35,6 +36,8 @@ public class Punishment {
     private static final Statement getAllPunishments = new Statement("SELECT * FROM Punishments WHERE UserId = ? ORDER BY `PunishmentId` DESC");
     private static final Statement insert = new Statement("INSERT INTO Punishments (UserId, Punisher, Type, Reason, EndTime, Perma) VALUES (?, ?, ?, ?, ?, ?)");
 
+    public static final Timestamp PERMA_TIME = Timestamp.from(Instant.ofEpochSecond(946674800));
+
     public static Punishment getPunishmentOfPlayer(int user, PunishmentType type) {
         return getPunishment.select(rs -> {
             if (rs.next())
@@ -62,6 +65,9 @@ public class Punishment {
     }
 
     public static Punishment createPunishment(int user, int executor, PunishmentType type, String reason, Timestamp endTime, boolean perma) {
+        if(perma && !endTime.equals(PERMA_TIME)) {
+            throw new IllegalArgumentException("Permanent punishments must have an end time of `Punishment.PERMA_TIME`");
+        }
         insert.update(user, executor, type.name(), reason, endTime, perma);
         return getPunishmentOfPlayer(user, type);
     }
diff --git a/src/de/steamwar/bungeecore/sql/SteamwarUser.java b/src/de/steamwar/bungeecore/sql/SteamwarUser.java
index 58c53a68..f3a6764c 100644
--- a/src/de/steamwar/bungeecore/sql/SteamwarUser.java
+++ b/src/de/steamwar/bungeecore/sql/SteamwarUser.java
@@ -297,6 +297,10 @@ public class SteamwarUser {
         return true;
     }
 
+    public void punishPerma(Punishment.PunishmentType type, String reason, int from) {
+        punish(type, Punishment.PERMA_TIME, reason, from, true);
+    }
+
     public void punish(Punishment.PunishmentType punishment, Timestamp time, String banReason, int from, boolean perma) {
         punishments.remove(punishment);
         punishments.put(punishment, Punishment.createPunishment(id, from, punishment, banReason, time, perma));

From e723224282756358d444a3083b47eb41ff7f30ad Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Sun, 10 Apr 2022 20:14:33 +0200
Subject: [PATCH 30/33] Fix Fabric stuff

---
 .../bungeecore/listeners/mods/Fabric.java     | 35 ++++++++-----------
 .../listeners/mods/ModLoaderBlocker.java      |  2 +-
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/de/steamwar/bungeecore/listeners/mods/Fabric.java b/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
index 252aac0e..4e0a8524 100644
--- a/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
+++ b/src/de/steamwar/bungeecore/listeners/mods/Fabric.java
@@ -38,8 +38,6 @@ import net.md_5.bungee.event.EventHandler;
 
 import java.nio.charset.StandardCharsets;
 import java.nio.charset.UnsupportedCharsetException;
-import java.sql.Timestamp;
-import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
@@ -48,9 +46,6 @@ public class Fabric extends BasicListener {
 
     private final Set<String> neededMods = new HashSet<>();
 
-    public static final Map<ProxiedPlayer, Integer> checkedPlayers = new HashMap<>();
-    private static final Map<ProxiedPlayer, Long> expectPluginMessage = new HashMap<>();
-
     {
         neededMods.add("java");
         neededMods.add("minecraft");
@@ -58,9 +53,9 @@ public class Fabric extends BasicListener {
         neededMods.add("steamwarmodsender");
 
         BungeeCord.getInstance().getScheduler().schedule(BungeeCore.get(), () -> {
-            synchronized (expectPluginMessage) {
-                for (Map.Entry<ProxiedPlayer, Long> entry : expectPluginMessage.entrySet()) {
-                    if (!checkedPlayers.containsKey(entry.getKey())) {
+            synchronized (Storage.fabricExpectPluginMessage) {
+                for (Map.Entry<ProxiedPlayer, Long> entry : Storage.fabricExpectPluginMessage.entrySet()) {
+                    if (!Storage.fabricCheckedPlayers.containsKey(entry.getKey())) {
                         continue;
                     }
                     if (System.currentTimeMillis() - entry.getValue() > TimeUnit.SECONDS.toMillis(20)) {
@@ -84,15 +79,15 @@ public class Fabric extends BasicListener {
         ProxiedPlayer player = (ProxiedPlayer) e.getSender();
         SteamwarUser user = SteamwarUser.get(player.getUniqueId());
 
-        if (!checkedPlayers.containsKey(player)) {
-            synchronized (expectPluginMessage) {
-                if (expectPluginMessage.containsKey(player)) {
+        if (!Storage.fabricCheckedPlayers.containsKey(player)) {
+            synchronized (Storage.fabricExpectPluginMessage) {
+                if (Storage.fabricExpectPluginMessage.containsKey(player)) {
                     banPlayer(user, player);
                     return;
                 }
             }
         }
-        expectPluginMessage.remove(player);
+        Storage.fabricExpectPluginMessage.remove(player);
 
         List<Mod> mods = new LinkedList<>();
 
@@ -141,15 +136,15 @@ public class Fabric extends BasicListener {
         }
 
         if(Utils.handleMods(player,mods)) {
-            if (checkedPlayers.containsKey(player)) {
-                long current = checkedPlayers.get(player);
+            if (Storage.fabricCheckedPlayers.containsKey(player)) {
+                long current = Storage.fabricCheckedPlayers.get(player);
                 if (current != dataString.hashCode()) {
                     banPlayer(user, player);
                     return;
                 }
             } else {
                 Message.send("MODIFICATION_CHECK_SUCCESS", player);
-                checkedPlayers.put(player, dataString.hashCode());
+                Storage.fabricCheckedPlayers.put(player, dataString.hashCode());
             }
             Storage.fabricPlayers.remove(player);
         }
@@ -158,8 +153,8 @@ public class Fabric extends BasicListener {
     @EventHandler
     public void onServerSwitchEvent(ServerSwitchEvent e) {
         if (e.getFrom() == null) return;
-        synchronized (expectPluginMessage) {
-            expectPluginMessage.put(e.getPlayer(), System.currentTimeMillis());
+        synchronized (Storage.fabricExpectPluginMessage) {
+            Storage.fabricExpectPluginMessage.put(e.getPlayer(), System.currentTimeMillis());
         }
     }
 
@@ -189,9 +184,9 @@ public class Fabric extends BasicListener {
     }
 
     public static void remove(ProxiedPlayer player) {
-        checkedPlayers.remove(player);
-        synchronized (expectPluginMessage) {
-            expectPluginMessage.remove(player);
+        Storage.fabricCheckedPlayers.remove(player);
+        synchronized (Storage.fabricExpectPluginMessage) {
+            Storage.fabricExpectPluginMessage.remove(player);
         }
     }
 }
diff --git a/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java b/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java
index 9965c3e6..71f8220f 100644
--- a/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java
+++ b/src/de/steamwar/bungeecore/listeners/mods/ModLoaderBlocker.java
@@ -46,7 +46,7 @@ public class ModLoaderBlocker extends BasicListener {
 
         if(new String(e.getData()).contains("fabric")){
             ProxiedPlayer p = (ProxiedPlayer) sender;
-            if (!Fabric.checkedPlayers.containsKey(p) && !Storage.fabricPlayers.contains(p)) {
+            if (!Storage.fabricCheckedPlayers.containsKey(p) && !Storage.fabricPlayers.contains(p)) {
                 Storage.fabricPlayers.add(p);
                 Message.send("MODLOADER_INSTALLED_FABRIC", p, "Fabric");
             }

From b5bf48ce2a733d47951fc09c573b9ec98c6ba250 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Mon, 11 Apr 2022 10:27:49 +0200
Subject: [PATCH 31/33] Update /bc to allow commands

---
 src/de/steamwar/bungeecore/listeners/ChatListener.java | 4 ++--
 src/de/steamwar/messages/BungeeCore.properties         | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/de/steamwar/bungeecore/listeners/ChatListener.java b/src/de/steamwar/bungeecore/listeners/ChatListener.java
index bc851416..f2ff5a1b 100644
--- a/src/de/steamwar/bungeecore/listeners/ChatListener.java
+++ b/src/de/steamwar/bungeecore/listeners/ChatListener.java
@@ -240,8 +240,8 @@ public class ChatListener extends BasicListener {
             return;
         }
 
-        if(command[1].startsWith("/")){
-            Message.send("CHAT_BC_NO_COMMANDS", sender);
+        if(command[1].startsWith("/") && command[1].contains(":")){
+            Message.send("UNKNOWN_COMMAND", sender);
             e.setCancelled(true);
             return;
         }
diff --git a/src/de/steamwar/messages/BungeeCore.properties b/src/de/steamwar/messages/BungeeCore.properties
index e985aaaf..ac971ac1 100644
--- a/src/de/steamwar/messages/BungeeCore.properties
+++ b/src/de/steamwar/messages/BungeeCore.properties
@@ -502,7 +502,6 @@ CHAT_YOYONOW_4=Ich wünsche dir noch weiterhin ein reibungsloses Spielerlebnis.
 CHAT_RECEIVE=§cUm Chatnachrichten versenden zu können, musst du auch welche empfangen!
 CHAT_NO_LINKS=§cDu darfst keine Links versenden.
 CHAT_BC_USAGE=§8/§e{0} §8[§7Nachricht§8]
-CHAT_BC_NO_COMMANDS=§cKeine Befehle mit /local möglich.
 
 #CheckListner
 CHECK_UNCHECKED=§7Du hast noch §e{0} §7ungeprüfte Schematic§8(§7s§8)!

From 9dcb35a91e0179429751f65a5465dd48de059501 Mon Sep 17 00:00:00 2001
From: Lixfel <agga-games@gmx.de>
Date: Wed, 13 Apr 2022 20:35:47 +0200
Subject: [PATCH 32/33] Fix pipeline null errors

Signed-off-by: Lixfel <agga-games@gmx.de>
---
 src/de/steamwar/bungeecore/listeners/mods/Forge.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/de/steamwar/bungeecore/listeners/mods/Forge.java b/src/de/steamwar/bungeecore/listeners/mods/Forge.java
index c936dd0f..6136fd5a 100644
--- a/src/de/steamwar/bungeecore/listeners/mods/Forge.java
+++ b/src/de/steamwar/bungeecore/listeners/mods/Forge.java
@@ -22,6 +22,7 @@ package de.steamwar.bungeecore.listeners.mods;
 import de.steamwar.bungeecore.BungeeCore;
 import de.steamwar.bungeecore.listeners.BasicListener;
 import de.steamwar.bungeecore.sql.Mod;
+import io.netty.channel.ChannelPipeline;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.PendingConnection;
 import net.md_5.bungee.api.event.LoginEvent;
@@ -78,7 +79,9 @@ public class Forge extends BasicListener {
         }
 
         event.registerIntent(BungeeCore.get());
-        wrapper.getHandle().pipeline().get(HandlerBoss.class).setHandler(new CustomPacketHandler(event));
+        ChannelPipeline pipeline = wrapper.getHandle().pipeline();
+        if(pipeline != null)
+            pipeline.get(HandlerBoss.class).setHandler(new CustomPacketHandler(event));
     }
 
     private static class CustomPacketHandler extends PacketHandler {

From 336d4f6a3cec6f45b3ccc309132cf46f04b54f89 Mon Sep 17 00:00:00 2001
From: Lixfel <agga-games@gmx.de>
Date: Wed, 13 Apr 2022 20:55:51 +0200
Subject: [PATCH 33/33] Fix NPE

Signed-off-by: Lixfel <agga-games@gmx.de>
---
 src/de/steamwar/bungeecore/listeners/mods/Forge.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/de/steamwar/bungeecore/listeners/mods/Forge.java b/src/de/steamwar/bungeecore/listeners/mods/Forge.java
index 6136fd5a..05397138 100644
--- a/src/de/steamwar/bungeecore/listeners/mods/Forge.java
+++ b/src/de/steamwar/bungeecore/listeners/mods/Forge.java
@@ -80,8 +80,11 @@ public class Forge extends BasicListener {
 
         event.registerIntent(BungeeCore.get());
         ChannelPipeline pipeline = wrapper.getHandle().pipeline();
-        if(pipeline != null)
-            pipeline.get(HandlerBoss.class).setHandler(new CustomPacketHandler(event));
+        if(pipeline != null) {
+            HandlerBoss handlerBoss = pipeline.get(HandlerBoss.class);
+            if(handlerBoss != null)
+                handlerBoss.setHandler(new CustomPacketHandler(event));
+        }
     }
 
     private static class CustomPacketHandler extends PacketHandler {