Merge branch 'master' into announceSpectate

src/de/steamwar/bungeecore/commands/GDPRQuery.java

@@ -60,7 +60,7 @@ public class GDPRQuery extends BasicCommand {
         sqlCSV(user, out, bauweltMember, "BuildMember.csv");
         sqlCSV(user, out, bauweltMembers, "BuildMembers.csv");
         sqlCSV(user, out, checkedSchems, "SchematicChecksessions.csv");
-        sqlCSV(user, out, elo, "Elo.csv");
+        sqlCSV(user, out, userElo, "UserElo.csv");
         sqlCSV(user, out, fights, "Fights.csv");
         sqlCSV(user, out, ignoredPlayers, "IgnoredPlayers.csv");
         sqlCSV(user, out, ignoringPlayers, "IgnoringPlayers.csv");
@@ -88,8 +88,8 @@ public class GDPRQuery extends BasicCommand {
     private static final Statement bauweltMember = new Statement("SELECT BauweltID AS Bauwelt, WorldEdit, World FROM BauweltMember WHERE MemberID = ?");
     private static final Statement bauweltMembers = new Statement("SELECT u.UserName AS 'User', m.WorldEdit AS WorldEdit, m.World AS World FROM BauweltMember m INNER JOIN UserData u ON m.MemberID = u.id WHERE m.BauweltID = ?");
     private static final Statement checkedSchems = new Statement("SELECT NodeName AS Schematic, StartTime, EndTime, DeclineReason AS Result FROM CheckedSchematic WHERE NodeOwner = ? ORDER BY StartTime ASC");
-    private static final Statement elo = new Statement("SELECT GameMode, Elo FROM Elo WHERE UserID = ?");
+    private static final Statement userElo = new Statement("SELECT GameMode, Elo, Season FROM Elo WHERE UserID = ?");
-    private static final Statement fights = new Statement("SELECT p.Team AS Team, p.Kit AS Kit, p.Kills AS Kills, p.IsOut AS Died, f.GameMode AS GameMode, f.Server AS Server, f.Arena AS Arena, f.StartTime AS StartTime, f.Duration AS Duration, (f.BlueLeader = p.UserID) AS IsBlueLeader, (f.RedLeader = p.UserID) AS IsRedLeader, f.Win AS Winner, f.WinCondition AS WinCondition FROM Fight f INNER JOIN FightPlayer p ON f.FightID = p.FightID WHERE p.UserID = ? ORDER BY StartTime ASC");
+    private static final Statement fights = new Statement("SELECT p.Team AS Team, p.Kit AS Kit, p.Kills AS Kills, p.IsOut AS Died, f.GameMode AS GameMode, f.Server AS Server, f.StartTime AS StartTime, f.Duration AS Duration, (f.BlueLeader = p.UserID) AS IsBlueLeader, (f.RedLeader = p.UserID) AS IsRedLeader, f.Win AS Winner, f.WinCondition AS WinCondition FROM Fight f INNER JOIN FightPlayer p ON f.FightID = p.FightID WHERE p.UserID = ? ORDER BY StartTime ASC");
     private static final Statement ignoredPlayers = new Statement("SELECT u.UserName AS IgnoredPlayer FROM IgnoredPlayers i INNER JOIN UserData u ON i.Ignored = u.id WHERE Ignorer = ?");
     private static final Statement ignoringPlayers = new Statement("SELECT Ignorer AS IgnoringPlayers FROM IgnoredPlayers WHERE Ignored = ?");
     private static final Statement schematicMember = new Statement("SELECT s.NodeName AS SchematicName, u.UserName AS SchematicOwner FROM NodeMember m INNER JOIN SchematicNode s ON m.NodeId = s.NodeId INNER JOIN UserData u ON s.NodeOwner = u.id WHERE m.UserId = ?");

src/de/steamwar/bungeecore/sql/UserElo.java

@@ -26,15 +26,16 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class UserElo {
     private UserElo() {}
 
     public static final int ELO_DEFAULT = 1000;
 
-    private static final Map<String, Map<Integer, Optional<Integer>>> gameModeUserEloCache = new HashMap<>();
+    private static final Map<String, Map<Integer, Optional<Integer>>> gameModeUserEloCache = new ConcurrentHashMap<>();
-    private static final Map<String, Integer> maxEloCache = new HashMap<>();
+    private static final Map<String, Integer> maxEloCache = new ConcurrentHashMap<>();
-    private static final Map<Integer, String> emblemCache = new HashMap<>();
+    private static final Map<Integer, String> emblemCache = new ConcurrentHashMap<>();
 
     private static final Statement elo = new Statement("SELECT Elo FROM UserElo WHERE UserID = ? AND GameMode = ? AND Season = ?");
     private static final Statement setElo = new Statement("INSERT INTO UserElo (Season, GameMode, UserID, Elo) VALUES (?, ?, ?, ?) ON DUPLICATE KEY UPDATE Elo = VALUES(Elo)");

src/de/steamwar/bungeecore/sql/UserGroup.java

@@ -24,12 +24,12 @@ import java.util.stream.Collectors;
 
 public enum UserGroup {
 
-    Admin("§4", "§e", "Admin", true, true, true, true),
+    Admin("§4", "§e", "Obererzieher", true, true, true, true),
-    Developer("§3", "§f", "Dev", true, true, true, true),
+    Developer("§3", "§f", "Seelsorger", true, true, true, true),
-    Moderator("§c", "§f", "Mod", true, true, true, true),
+    Moderator("§c", "§f", "Schichtleiter", true, true, true, true),
-    Supporter("§9", "§f", "Sup", false, true, true, true),
+    Supporter("§9", "§f", "Kindergärtner", false, true, true, true),
-    Builder("§2", "§f", "Arch", false, true, false, true),
+    Builder("§2", "§f", "Hausmeister", false, true, false, true),
-    YouTuber("§5", "§f", "YT", false, false, false, true),
+    YouTuber("§5", "§f", "Reporter", false, false, false, true),
     Member("§7", "§7", "", false, false, false, false);
 
     private final String colorCode;