Release 2.0.24 (#244 )

Recode map CAPTCHA (#243 )
* feat: implement capja for CAPTCHA generation * feat: implement map color palette for 1.7.2-1.20.4
2026-11-05 17:22:34 -05:00 · 2024-03-24 20:25:30 +01:00 · 2024-03-24 20:17:18 +01:00 · 2024-03-22 14:01:32 +01:00 · 2024-03-22 13:56:55 +01:00 · 2024-03-16 11:25:43 +01:00
59 changed files with 899 additions and 717 deletions
@@ -6,7 +6,7 @@ buildscript {

 plugins {
  id("java")
-  id("io.github.goooler.shadow") version "8.1.5"
+  id("io.github.goooler.shadow") version "8.1.7"
  id("io.toolebox.git-versioner") version "1.6.7"
 }

@@ -80,6 +80,9 @@ tasks {
    relocate("com.google.gson", "xyz.jonesdev.sonar.libs.gson")
    relocate("com.j256.ormlite", "xyz.jonesdev.sonar.libs.ormlite")
    relocate("com.github.benmanes.caffeine", "xyz.jonesdev.sonar.libs.caffeine")
+    relocate("com.mysql", "xyz.jonesdev.sonar.libs.mysql")
+    relocate("org.mariadb", "xyz.jonesdev.sonar.libs.mariadb")
+    relocate("xyz.jonesdev.capja", "xyz.jonesdev.sonar.libs.capja")

    // TODO: actually fix this :/
    // We have to be careful here, so we don't accidentally break adventure
@@ -1,3 +1,3 @@
 group=xyz.jonesdev.sonar
-version=2.0.19
+version=2.0.24
 description=Effective Anti-bot plugin for Velocity, BungeeCord, and Bukkit (1.7-latest)
@@ -19,6 +19,7 @@ package xyz.jonesdev.sonar.api;

 import net.kyori.adventure.audience.Audience;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import xyz.jonesdev.sonar.api.attack.AttackTracker;
 import xyz.jonesdev.sonar.api.command.subcommand.SubcommandRegistry;
 import xyz.jonesdev.sonar.api.config.SonarConfiguration;
@@ -33,8 +34,7 @@ import xyz.jonesdev.sonar.api.verbose.Verbose;

 import java.io.File;
 import java.text.DecimalFormat;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.UUID;

 public interface Sonar {
  DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#,###.##");
@@ -43,7 +43,7 @@ public interface Sonar {
   * Since we want to use Adventure on every server platform,
   * we have to use their platform module to support BungeeCord and Bukkit
   */
-  Map<String, Audience> AUDIENCES = new ConcurrentHashMap<>();
+  @Nullable Audience audience(final @Nullable UUID uniqueId);

  /**
   * @return The platform the plugin is being run on
@@ -101,42 +101,44 @@ public final class AttackTracker {
        Sonar.get().getEventManager().publish(new AttackMitigatedEvent(currentAttack));

        if (++attackThreshold > Sonar.get().getConfig().getMinAttackThreshold()) {
-          // Save attack statistics
-          final long deltaInMillis = currentAttack.duration.delay();
-          final String peakCPU = Sonar.DECIMAL_FORMAT.format(currentAttack.peakProcessCPUUsage);
-          final String peakMem = formatMemory(currentAttack.peakProcessMemoryUsage);
-          final String peakBPS = Sonar.DECIMAL_FORMAT.format(currentAttack.peakJoinsPerSecond);
-          final String peakCPS = Sonar.DECIMAL_FORMAT.format(currentAttack.peakConnectionsPerSecond);
-          final long minutes = deltaInMillis / (60 * 1000); // Convert milliseconds to minutes
-          final double seconds = (deltaInMillis % (60 * 1000)) / 1000D; // Convert remaining milliseconds to seconds
-          final String formattedDuration = String.format("%d minutes, %.0f seconds", minutes, seconds);
-          final String startTimestamp = String.valueOf(currentAttack.duration.getStart() / 1000L);
-          final String endTimestamp = String.valueOf(System.currentTimeMillis() / 1000L);
-          final long blacklisted = Sonar.get().getFallback().getBlacklist().estimatedSize();
-          // Calculate during-attack-statistics using their deltas
-          final long totalVerified = Sonar.get().getVerifiedPlayerController().estimatedSize();
-          final long verified = Math.max(totalVerified - currentAttack.successfulVerifications, 0);
-          final long totalFailed = Sonar.get().getStatistics().getTotalFailedVerifications();
-          final long failed = Math.max(totalFailed - currentAttack.failedVerifications, 0);
-
          // Post webhook to Discord
          Optional.ofNullable(Sonar.get().getConfig().getWebhook().getDiscordWebhook())
-            .ifPresent(webhook -> webhook.post(() -> {
-              final SonarConfiguration.Webhook.Embed config = Sonar.get().getConfig().getWebhook().getEmbed();
-              final String description = config.getDescription()
-                .replace("%start-timestamp%", startTimestamp)
-                .replace("%end-timestamp%", endTimestamp)
-                .replace("%duration%", formattedDuration)
-                .replace("%peak-cpu%", peakCPU)
-                .replace("%peak-memory%", peakMem)
-                .replace("%peak-bps%", peakBPS)
-                .replace("%peak-cps%", peakCPS)
-                .replace("%total-blacklisted%", Sonar.DECIMAL_FORMAT.format(blacklisted))
-                .replace("%total-failed%", Sonar.DECIMAL_FORMAT.format(failed))
-                .replace("%total-success%", Sonar.DECIMAL_FORMAT.format(verified));
-              return new SonarConfiguration.Webhook.Embed(
-                config.getTitle(), config.getTitleUrl(), description, config.getR(), config.getG(), config.getB());
-            }));
+            .ifPresent(webhook -> {
+              // Save attack statistics
+              final long deltaInMillis = currentAttack.duration.delay();
+              final String peakCPU = Sonar.DECIMAL_FORMAT.format(currentAttack.peakProcessCPUUsage);
+              final String peakMem = formatMemory(currentAttack.peakProcessMemoryUsage);
+              final String peakBPS = Sonar.DECIMAL_FORMAT.format(currentAttack.peakJoinsPerSecond);
+              final String peakCPS = Sonar.DECIMAL_FORMAT.format(currentAttack.peakConnectionsPerSecond);
+              final long minutes = deltaInMillis / (60 * 1000); // Convert milliseconds to minutes
+              final double seconds = (deltaInMillis % (60 * 1000)) / 1000D; // Convert remaining milliseconds to seconds
+              final String formattedDuration = String.format("%d minutes, %.0f seconds", minutes, seconds);
+              final String startTimestamp = String.valueOf(currentAttack.duration.getStart() / 1000L);
+              final String endTimestamp = String.valueOf(System.currentTimeMillis() / 1000L);
+              final long blacklisted = Sonar.get().getFallback().getBlacklist().estimatedSize();
+              // Calculate during-attack-statistics using their deltas
+              final long totalVerified = Sonar.get().getVerifiedPlayerController().estimatedSize();
+              final long verified = Math.max(totalVerified - currentAttack.successfulVerifications, 0);
+              final long totalFailed = Sonar.get().getStatistics().getTotalFailedVerifications();
+              final long failed = Math.max(totalFailed - currentAttack.failedVerifications, 0);
+
+              webhook.post(() -> {
+                final SonarConfiguration.Webhook.Embed config = Sonar.get().getConfig().getWebhook().getEmbed();
+                final String description = config.getDescription()
+                  .replace("%start-timestamp%", startTimestamp)
+                  .replace("%end-timestamp%", endTimestamp)
+                  .replace("%duration%", formattedDuration)
+                  .replace("%peak-cpu%", peakCPU)
+                  .replace("%peak-memory%", peakMem)
+                  .replace("%peak-bps%", peakBPS)
+                  .replace("%peak-cps%", peakCPS)
+                  .replace("%total-blacklisted%", Sonar.DECIMAL_FORMAT.format(blacklisted))
+                  .replace("%total-failed%", Sonar.DECIMAL_FORMAT.format(failed))
+                  .replace("%total-success%", Sonar.DECIMAL_FORMAT.format(verified));
+                return new SonarConfiguration.Webhook.Embed(
+                  config.getTitle(), config.getTitleUrl(), description, config.getR(), config.getG(), config.getB());
+              });
+            });
        }

        // Reset the attack status
@@ -23,12 +23,13 @@ import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;

+import java.util.UUID;
 import java.util.function.Predicate;

@Getter
@RequiredArgsConstructor
 public abstract class InvocationSource {
-  private final String name;
+  private final UUID uuid;
  private final Audience audience;
  private final boolean player;
  private final Predicate<String> permissionFunction;
@@ -17,6 +17,7 @@

 package xyz.jonesdev.sonar.api.config;

+import com.j256.ormlite.db.DatabaseType;
 import lombok.*;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -25,6 +26,8 @@ import org.jetbrains.annotations.Nullable;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.command.SonarCommand;
 import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
+import xyz.jonesdev.sonar.api.ormlite.MariaDbDatabaseTypeAdapter;
+import xyz.jonesdev.sonar.api.ormlite.MysqlDatabaseTypeAdapter;
 import xyz.jonesdev.sonar.api.webhook.DiscordWebhook;

 import java.io.File;
@@ -170,24 +173,28 @@ public final class SonarConfiguration {
    verification.timing = Verification.Timing.valueOf(generalConfig.getString("verification.timing"));
    verification.gravity.enabled = generalConfig.getBoolean("verification.checks.gravity.enabled");
    verification.gravity.checkCollisions = generalConfig.getBoolean("verification.checks.gravity.check-collisions");
+    verification.gravity.captchaOnFail = generalConfig.getBoolean("verification.checks.gravity.captcha-on-fail");
    verification.gravity.maxMovementTicks = clamp(generalConfig.getInt("verification.checks.gravity.max-movement-ticks"), 2, 100);
    verification.gravity.maxIgnoredTicks = clamp(generalConfig.getInt("verification.checks.gravity.max-ignored-ticks"), 1, 128);
    verification.gravity.gamemode = Verification.Gravity.Gamemode.valueOf(generalConfig.getString("verification.checks.gravity.gamemode"));

    verification.map.timing = Verification.Timing.valueOf(generalConfig.getString("verification.checks.map-captcha.timing"));
-    verification.map.randomizePositions = generalConfig.getBoolean("verification.checks.map-captcha.random-position");
-    verification.map.distortionsFactorX = clamp(generalConfig.getInt(
-      "verification.checks.map-captcha.distortions-factor-x"), 0, 100) / 100D;
-    verification.map.distortionsFactorY = clamp(generalConfig.getInt(
-      "verification.checks.map-captcha.distortions-factor-y"), 0, 100) / 100D;
-    verification.map.randomLinesAmount = generalConfig.getInt("verification.checks.map-captcha.random-lines");
-    verification.map.randomOvalsAmount = generalConfig.getInt("verification.checks.map-captcha.random-ovals");
-    verification.map.randomizeFontSize = generalConfig.getBoolean("verification.checks.map-captcha.random-font-size");
+
+    verification.map.flare = generalConfig.getBoolean("verification.checks.map-captcha.effects.flare");
+    verification.map.scratches = generalConfig.getBoolean("verification.checks.map-captcha.effects.scratches");
+    verification.map.ripple = generalConfig.getBoolean("verification.checks.map-captcha.effects.ripple");
+    verification.map.smear = generalConfig.getBoolean("verification.checks.map-captcha.effects.smear");
+    verification.map.pinch = generalConfig.getBoolean("verification.checks.map-captcha.effects.pinch");
+    verification.map.saturation = (float) generalConfig.getYaml().getDouble(
+      "verification.checks.map-captcha.effects.saturation", 0.3);
+    verification.map.distortion = (float) generalConfig.getYaml().getDouble(
+      "verification.checks.map-captcha.effects.distortion", 2);
+
    verification.map.precomputeAmount = generalConfig.getInt("verification.checks.map-captcha.precompute");
    verification.map.maxDuration = generalConfig.getInt("verification.checks.map-captcha.max-duration");
    verification.map.maxTries = generalConfig.getInt("verification.checks.map-captcha.max-tries");
    verification.map.dictionary = generalConfig.getString("verification.checks.map-captcha.dictionary");
-    verification.map.fonts = generalConfig.getStringList("verification.checks.map-captcha.fonts");
+    verification.map.fonts = generalConfig.getStringList("verification.checks.map-captcha.font-names");

    verification.brand.enabled = generalConfig.getBoolean("verification.checks.client-brand.enabled");
    verification.brand.validRegex = Pattern.compile(generalConfig.getString("verification.checks.client-brand.valid-regex"));
@@ -417,8 +424,13 @@ public final class SonarConfiguration {
    private Timing timing;

    @Getter
+    @RequiredArgsConstructor
    public enum Timing {
-      ALWAYS, DURING_ATTACK, NEVER
+      ALWAYS("Always"),
+      DURING_ATTACK("During Attack"),
+      NEVER("Never");
+
+      private final String displayName;
    }

    private final Map map = new Map();
@@ -428,12 +440,13 @@ public final class SonarConfiguration {
    @Getter
    public static final class Map {
      private Timing timing;
-      private boolean randomizePositions;
-      private boolean randomizeFontSize;
-      private double distortionsFactorX;
-      private double distortionsFactorY;
-      private int randomLinesAmount;
-      private int randomOvalsAmount;
+      private boolean flare;
+      private boolean scratches;
+      private boolean ripple;
+      private boolean smear;
+      private boolean pinch;
+      private float saturation;
+      private float distortion;
      private int precomputeAmount;
      private int maxDuration;
      private int maxTries;
@@ -448,6 +461,7 @@ public final class SonarConfiguration {
    public static final class Gravity {
      private boolean enabled;
      private boolean checkCollisions;
+      private boolean captchaOnFail;
      private Gamemode gamemode;
      private int maxMovementTicks;
      private int maxIgnoredTicks;
@@ -557,10 +571,12 @@ public final class SonarConfiguration {
    @Getter
    @RequiredArgsConstructor
    public enum Type {
-      MYSQL("com.mysql.cj.jdbc.NonRegisteringDriver"),
-      NONE(null);
+      MYSQL("jdbc:mysql://%s:%d/%s", new MysqlDatabaseTypeAdapter()),
+      MARIADB("jdbc:mariadb://%s:%d/%s", new MariaDbDatabaseTypeAdapter()),
+      NONE(null, null);

-      private final String driverClassName;
+      private final String connectionString;
+      private final DatabaseType databaseType;
    }

    private Type type;
@@ -19,7 +19,7 @@ package xyz.jonesdev.sonar.api.controller;

 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
-import com.j256.ormlite.jdbc.JdbcSingleConnectionSource;
+import com.j256.ormlite.jdbc.JdbcPooledConnectionSource;
 import com.j256.ormlite.stmt.QueryBuilder;
 import com.j256.ormlite.support.ConnectionSource;
 import com.j256.ormlite.table.TableUtils;
@@ -27,14 +27,15 @@ import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Range;
+import org.jetbrains.annotations.Unmodifiable;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.config.SonarConfiguration;
 import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
 import xyz.jonesdev.sonar.api.model.VerifiedPlayer;

-import java.lang.reflect.Method;
 import java.net.InetAddress;
-import java.sql.*;
+import java.sql.SQLException;
+import java.sql.Timestamp;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
@@ -43,7 +44,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

 public final class VerifiedPlayerController {
-  private static final Map<String, Collection<UUID>> MAP = new ConcurrentHashMap<>();
  private static final ExecutorService DB_UPDATE_SERVICE = Executors.newSingleThreadExecutor();

  private static final LoggerWrapper LOGGER = new LoggerWrapper() {
@@ -64,6 +64,7 @@ public final class VerifiedPlayerController {
    }
  };

+  private final Map<String, Collection<UUID>> cache = new ConcurrentHashMap<>(128);
  private @Nullable ConnectionSource connectionSource;
  private Dao<VerifiedPlayer, Integer> dao;
  private QueryBuilder<VerifiedPlayer, Integer> queryBuilder;
@@ -71,8 +72,9 @@ public final class VerifiedPlayerController {
  private final @NotNull SonarConfiguration.Database.Type cachedDatabaseType;

  public VerifiedPlayerController() {
+    final SonarConfiguration.Database database = Sonar.get().getConfig().getDatabase();
    // Cache selected database type, so we don't need to call Sonar.get() every time
-    cachedDatabaseType = Sonar.get().getConfig().getDatabase().getType();
+    cachedDatabaseType = database.getType();

    // Don't establish a database connection if the type is NONE
    if (cachedDatabaseType == SonarConfiguration.Database.Type.NONE) {
@@ -80,8 +82,14 @@ public final class VerifiedPlayerController {
      return;
    }

-    try (final ConnectionSource connectionSource = setupDriverAndConnect()) {
-      this.connectionSource = connectionSource;
+    // Initialize MySQL/MariaDB driver
+    database.getType().getDatabaseType().loadDriver();
+
+    try {
+      connectionSource = new JdbcPooledConnectionSource(
+        String.format(database.getType().getConnectionString(),
+          database.getHost(), database.getPort(), database.getName()),
+        database.getUsername(), database.getPassword(), database.getType().getDatabaseType());

      // Create table
      try {
@@ -98,83 +106,53 @@ public final class VerifiedPlayerController {
      // Make sure to run the clean task and the caching task in the same thread
      // https://github.com/jonesdevelopment/sonar/issues/150
      DB_UPDATE_SERVICE.execute(() -> {
-        // Make sure to clear all outdated entries first
-        clearOld(Sonar.get().getConfig().getDatabase().getMaximumAge());
-        // Add all entries from the database to the cache
        try {
+          // Make sure to clear all outdated entries first
+          clearOld(database.getMaximumAge());
+          // Add all entries from the database to the cache
          dao.queryForAll().forEach(this::_add);
        } catch (SQLException exception) {
-          LOGGER.error("Could not cache entries: {}", exception);
+          LOGGER.error("Error initializing database: {}", exception);
        }
      });
-    } catch (Throwable throwable) {
-      LOGGER.error("Error setting up database: {}", throwable);
-      throwable.printStackTrace(System.err);
+    } catch (SQLException exception) {
+      LOGGER.error("Error setting up database: {}", exception);
    }
  }

  /**
-   * Automatically sets up the database connection using the configured credentials
+   * Closes the connection if instantiated
   */
-  private static @NotNull ConnectionSource setupDriverAndConnect() throws Throwable {
-    final SonarConfiguration.Database database = Sonar.get().getConfig().getDatabase();
-
-    // Prepare the JDBC connection string
-    // TODO: automatically build best connection string for database type
-    final String jdbcURL = String.format("jdbc:%s://%s:%d/%s",
-      database.getType().name().toLowerCase(), database.getHost(), database.getPort(), database.getName());
-
-    // Use reflection to uncover the driver class
-    final Class<?> driverClass = Class.forName(database.getType().getDriverClassName());
-
-    // Make sure we send the username and password
-    final Properties credentials = new Properties();
-    credentials.put("user", database.getUsername());
-    credentials.put("password", database.getPassword());
-
-    // Return new JDBC connection instance for our controller to handle
-    return new JdbcSingleConnectionSource(jdbcURL, invoke(jdbcURL, driverClass, credentials));
-  }
-
-  /**
-   * Uses reflection to load the database driver from the injected library
-   *
-   * @param connectionString URL of the database
-   * @param driverClass      Class of the database driver
-   * @param credentials      Credentials for the database
-   */
-  private static Connection invoke(final @NotNull String connectionString,
-                                   final @NotNull Class<?> driverClass,
-                                   final @NotNull Properties credentials) throws Throwable {
-    final Object driver = driverClass.getDeclaredConstructor().newInstance();
-    DriverManager.registerDriver((Driver) driver);
-    final Method connect = driverClass.getDeclaredMethod("connect", String.class, Properties.class);
-    connect.setAccessible(true);
-    return (Connection) connect.invoke(driver, connectionString, credentials);
+  public void close() {
+    // The connection source will always be null if the database type is NONE.
+    if (connectionSource != null) {
+      try {
+        // Properly close the connection
+        connectionSource.close();
+      } catch (Exception exception) {
+        LOGGER.error("Error closing database: {}", exception);
+      }
+    }
  }

  /**
   * Clear all old entries using the given timestamp.
   */
-  private void clearOld(final @Range(from = 1, to = 365) int maximumAge) {
-    try {
-      final long timestamp = Instant.now()
-        .minus(maximumAge, ChronoUnit.DAYS)
-        .getEpochSecond() * 1000L; // convert to ms
+  private void clearOld(final @Range(from = 1, to = 365) int maximumAge) throws SQLException {
+    final long timestamp = Instant.now()
+      .minus(maximumAge, ChronoUnit.DAYS)
+      .getEpochSecond() * 1000L; // convert to ms

-      final List<VerifiedPlayer> oldEntries = queryBuilder.where()
-        .lt("timestamp", new Timestamp(timestamp))
-        .query();
+    final List<VerifiedPlayer> oldEntries = queryBuilder.where()
+      .lt("timestamp", new Timestamp(timestamp))
+      .query();

-      if (oldEntries != null) {
-        for (final VerifiedPlayer player : oldEntries) {
-          dao.delete(player);
-        }
-        LOGGER.info("Removed {} database entries older than {} days.",
-          oldEntries.size(), maximumAge);
+    if (oldEntries != null) {
+      for (final VerifiedPlayer player : oldEntries) {
+        dao.delete(player);
      }
-    } catch (SQLException exception) {
-      LOGGER.error("Error trying to clear old entries: {}", exception);
+      LOGGER.info("Removed {} database entries older than {} days.",
+        oldEntries.size(), maximumAge);
    }
  }

@@ -221,7 +199,7 @@ public final class VerifiedPlayerController {
   * @param inetAddress IP address of the player
   */
  private void _remove(final @NotNull String inetAddress) {
-    MAP.remove(inetAddress);
+    cache.remove(inetAddress);
  }

  /**
@@ -259,24 +237,30 @@ public final class VerifiedPlayerController {
   * @param player VerifiedPlayer model
   */
  private void _add(final @NotNull VerifiedPlayer player) {
-    MAP.computeIfAbsent(player.getInetAddress(), v -> new Vector<>())
+    cache.computeIfAbsent(player.getInetAddress(), v -> new ArrayList<>())
      .add(player.getPlayerUUID());
  }

  /**
+   * Returns the amount of verified IP addresses
+   *
   * @return Estimated size of the local cache
   */
  public synchronized int estimatedSize() {
-    return MAP.values().stream()
-      .mapToInt(Collection::size)
-      .sum();
+    /*
+     * TODO: Work on this
+     * return MAP.values().stream()
+     *   .mapToInt(Collection::size)
+     *   .sum();
+     */
+    return cache.size();
  }

  /**
   * @return List of UUIDs associated with one IP address
   */
-  public Collection<UUID> getUUIDs(final @NotNull String inetAddress) {
-    return MAP.getOrDefault(inetAddress, Collections.emptyList());
+  public @Unmodifiable Collection<UUID> getUUIDs(final @NotNull String inetAddress) {
+    return cache.getOrDefault(inetAddress, Collections.emptyList());
  }

  /**
@@ -285,7 +269,7 @@ public final class VerifiedPlayerController {
   */
  public void clearAll() {
    try {
-      MAP.clear();
+      cache.clear();

      // Only update the column if the database type is not NONE
      if (cachedDatabaseType != SonarConfiguration.Database.Type.NONE) {
@@ -302,7 +286,7 @@ public final class VerifiedPlayerController {
   * @return Whether the local cache contains the IP and UUID
   */
  public boolean has(final @NotNull String inetAddress, final @NotNull UUID uuid) {
-    final Collection<UUID> got = MAP.get(inetAddress);
+    final Collection<UUID> got = cache.get(inetAddress);
    if (got != null) {
      return got.contains(uuid);
    }
@@ -324,7 +308,7 @@ public final class VerifiedPlayerController {
   * @return Whether the local cache contains the IP
   */
  public boolean has(final @NotNull String inetAddress) {
-    return MAP.containsKey(inetAddress);
+    return cache.containsKey(inetAddress);
  }

  /**
@@ -20,13 +20,15 @@ package xyz.jonesdev.sonar.api.fallback.protocol;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

-import java.util.*;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;

@Getter
@RequiredArgsConstructor
 public enum ProtocolVersion {
  UNKNOWN(-1),
-  LEGACY(-2),
  MINECRAFT_1_7_2(4),
  MINECRAFT_1_7_6(5),
  MINECRAFT_1_8(47),
@@ -70,10 +72,8 @@ public enum ProtocolVersion {

  private final int protocol;

-  public static final ProtocolVersion MINIMUM_VERSION = MINECRAFT_1_7_2;
  public static final ProtocolVersion LATEST_VERSION;
  public static final Map<Integer, ProtocolVersion> ID_TO_PROTOCOL_CONSTANT;
-  public static final Set<ProtocolVersion> SUPPORTED_VERSIONS;

  static {
    {
@@ -90,12 +90,11 @@ public enum ProtocolVersion {
      final Set<ProtocolVersion> versions = EnumSet.noneOf(ProtocolVersion.class);

      for (final ProtocolVersion value : values()) {
-        if (!value.isUnknown() && !value.isLegacy()) {
+        if (!value.isUnknown()) {
          versions.add(value);
        }
      }

-      SUPPORTED_VERSIONS = Collections.unmodifiableSet(versions);
      LATEST_VERSION = (ProtocolVersion) versions.toArray()[versions.size() - 1];
    }
  }
@@ -111,9 +110,4 @@ public enum ProtocolVersion {
  public boolean isUnknown() {
    return this == UNKNOWN;
  }
-
-  @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-  public boolean isLegacy() {
-    return this == LEGACY;
-  }
 }
@@ -26,7 +26,7 @@ import java.lang.management.ManagementFactory;
 public class JVMProcessInformation {
  private final Runtime RUNTIME = Runtime.getRuntime();
  private final OperatingSystemMXBean MX = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
-  private final char[] MEMORY_UNITS = {'k', 'M', 'G', 'T', 'P', 'E'};
+  private final char[] MEMORY_UNITS = {'K', 'M', 'G', 'T', 'P', 'E'};

  public String formatMemory(final long size) {
    if (size < 1024L) {
@@ -35,7 +35,8 @@ public class JVMProcessInformation {
    final int group = (63 - Long.numberOfLeadingZeros(size)) / 10;
    final double formattedSize = (double) size / (1L << (group * 10));
    final char unit = MEMORY_UNITS[group - 1];
-    return String.format("%.1f %sB", formattedSize, unit);
+    // https://en.wikipedia.org/wiki/Byte#Multiple-byte_units
+    return String.format("%.1f %siB", formattedSize, unit);
  }

  public int getVirtualCores() {
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2023-2024 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.jonesdev.sonar.api.ormlite;
+
+import com.j256.ormlite.jdbc.db.MariaDbDatabaseType;
+import org.jetbrains.annotations.NotNull;
+
+public final class MariaDbDatabaseTypeAdapter extends MariaDbDatabaseType {
+
+  @Override
+  protected String @NotNull [] getDriverClassNames() {
+    return new String[]{"xyz.jonesdev.sonar.libs.mariadb.jdbc.Driver"};
+  }
+}
@@ -15,16 +15,15 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.common.fallback.protocol.map;
+package xyz.jonesdev.sonar.api.ormlite;

-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
+import com.j256.ormlite.jdbc.db.MysqlDatabaseType;
+import org.jetbrains.annotations.NotNull;

-@Getter
-@RequiredArgsConstructor
-public final class MapInfo {
-  private final String answer;
-  private final int columns, rows;
-  private final int x, y;
-  private final byte[] buffer;
+public final class MysqlDatabaseTypeAdapter extends MysqlDatabaseType {
+
+  @Override
+  protected String @NotNull [] getDriverClassNames() {
+    return new String[]{"xyz.jonesdev.sonar.libs.mysql.cj.jdbc.Driver"};
+  }
 }
@@ -27,13 +27,14 @@ import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.statistics.SonarStatistics;

 import java.util.Collection;
+import java.util.UUID;
 import java.util.Vector;

 import static xyz.jonesdev.sonar.api.Sonar.DECIMAL_FORMAT;

@Getter
 public final class Notification implements Observable {
-  private final @NotNull Collection<String> subscribers = new Vector<>(0);
+  private final @NotNull Collection<UUID> subscribers = new Vector<>(0);

  public void sendAttackNotification() {
    // No need to do anything if we have no subscribers
@@ -65,8 +66,8 @@ public final class Notification implements Observable {
        .replace("%incoming-traffic-ttl%", statistics.getTotalIncomingBandwidthFormatted())
        .replace("%outgoing-traffic-ttl%", statistics.getTotalOutgoingBandwidthFormatted()));
    // Send the title and chat messages to all online players
-    for (final String subscriber : Sonar.get().getNotificationHandler().getSubscribers()) {
-      final Audience audience = Sonar.AUDIENCES.get(subscriber);
+    for (final UUID subscriber : Sonar.get().getNotificationHandler().getSubscribers()) {
+      final Audience audience = Sonar.get().audience(subscriber);
      if (audience == null) continue;
      audience.showTitle(title);
      audience.sendMessage(chat);
@@ -20,29 +20,30 @@ package xyz.jonesdev.sonar.api.verbose;
 import org.jetbrains.annotations.NotNull;

 import java.util.Collection;
+import java.util.UUID;

 public interface Observable {
-  Collection<String> getSubscribers();
+  Collection<UUID> getSubscribers();

  /**
-   * @param name Name of the audience
+   * @param uuid UUID of the player
   * @return Whether the audience is subscribed or not
   */
-  default boolean isSubscribed(final @NotNull String name) {
-    return getSubscribers().contains(name);
+  default boolean isSubscribed(final @NotNull UUID uuid) {
+    return getSubscribers().contains(uuid);
  }

  /**
-   * @param name Name of the audience to subscribe
+   * @param uuid UUID of the player
   */
-  default void subscribe(final String name) {
-    getSubscribers().add(name);
+  default void subscribe(final UUID uuid) {
+    getSubscribers().add(uuid);
  }

  /**
-   * @param name Name of the audience to unsubscribe
+   * @param uuid UUID of the player
   */
-  default void unsubscribe(final String name) {
-    getSubscribers().remove(name);
+  default void unsubscribe(final UUID uuid) {
+    getSubscribers().remove(uuid);
  }
 }
@@ -29,6 +29,7 @@ import xyz.jonesdev.sonar.api.statistics.SonarStatistics;
 import xyz.jonesdev.sonar.api.timer.SystemTimer;

 import java.util.Collection;
+import java.util.UUID;
 import java.util.Vector;

 import static xyz.jonesdev.sonar.api.Sonar.DECIMAL_FORMAT;
@@ -36,7 +37,7 @@ import static xyz.jonesdev.sonar.api.jvm.JVMProcessInformation.*;

@Getter
 public final class Verbose implements Observable {
-  private final @NotNull Collection<String> subscribers = new Vector<>(0);
+  private final @NotNull Collection<UUID> subscribers = new Vector<>(0);
  private int animationIndex;

  // Run action bar verbose
@@ -48,8 +49,8 @@ public final class Verbose implements Observable {
    // Prepare the action bar format component
    final Component component = prepareActionBarFormat();
    // Send the action bar to all online players
-    for (final String subscriber : subscribers) {
-      final Audience audience = Sonar.AUDIENCES.get(subscriber);
+    for (final UUID subscriber : subscribers) {
+      final Audience audience = Sonar.get().audience(subscriber);
      if (audience == null) continue;
      audience.sendActionBar(component);
    }
@@ -19,18 +19,21 @@ package xyz.jonesdev.sonar.bukkit;

 import com.alessiodp.libby.BukkitLibraryManager;
 import lombok.Getter;
+import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bstats.bukkit.Metrics;
+import org.bstats.charts.SimplePie;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.SonarPlatform;
 import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
-import xyz.jonesdev.sonar.bukkit.audience.AudienceListener;
 import xyz.jonesdev.sonar.bukkit.command.BukkitSonarCommand;
 import xyz.jonesdev.sonar.common.boot.SonarBootstrap;
 import xyz.jonesdev.sonar.common.statistics.CachedBandwidthStatistics;

 import java.util.Objects;
+import java.util.UUID;

@Getter
 public final class SonarBukkit extends SonarBootstrap<SonarBukkitPlugin> {
@@ -48,6 +51,14 @@ public final class SonarBukkit extends SonarBootstrap<SonarBukkitPlugin> {
   */
  private final BukkitAudiences bukkitAudiences = BukkitAudiences.create(getPlugin());

+  @Override
+  public @NotNull Audience audience(final @Nullable UUID uniqueId) {
+    if (uniqueId == null) {
+      return bukkitAudiences.console();
+    }
+    return bukkitAudiences.player(uniqueId);
+  }
+
  /**
   * Create a wrapper for the plugin logger, so we can use it outside
   * the velocity module.
@@ -72,18 +83,22 @@ public final class SonarBukkit extends SonarBootstrap<SonarBukkitPlugin> {
    }
  };

+  private Metrics metrics;
+
  @Override
  public void enable() {
-
    // Initialize bStats.org metrics
-    new Metrics(getPlugin(), getPlatform().getMetricsId());
+    metrics = new Metrics(getPlugin(), getPlatform().getMetricsId());
+
+    // Add charts for some configuration options
+    metrics.addCustomChart(new SimplePie("verification",
+      () -> getConfig().getVerification().getTiming().getDisplayName()));
+    metrics.addCustomChart(new SimplePie("captcha",
+      () -> getConfig().getVerification().getMap().getTiming().getDisplayName()));

    // Register Sonar command
    Objects.requireNonNull(getPlugin().getCommand("sonar")).setExecutor(new BukkitSonarCommand());

-    // Register audience register listener
-    getPlugin().getServer().getPluginManager().registerEvents(new AudienceListener(), getPlugin());
-
    // Register traffic service
    getPlugin().getServer().getScheduler().runTaskTimerAsynchronously(getPlugin(),
      CachedBandwidthStatistics::reset, 20L, 20L);
@@ -96,4 +111,10 @@ public final class SonarBukkit extends SonarBootstrap<SonarBukkitPlugin> {
    getPlugin().getServer().getScheduler().runTaskTimerAsynchronously(getPlugin(),
      Sonar.get().getVerboseHandler()::update, 4L, 4L);
  }
+
+  @Override
+  public void disable() {
+    // Make sure to properly shutdown bStats metrics
+    metrics.shutdown();
+  }
 }
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2023-2024 Sonar Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package xyz.jonesdev.sonar.bukkit.audience;
-
-import net.kyori.adventure.audience.Audience;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.bukkit.SonarBukkit;
-
-public final class AudienceListener implements Listener {
-
-  @EventHandler(priority = EventPriority.HIGHEST)
-  public void handle(final @NotNull PlayerJoinEvent event) {
-    final Audience audience = SonarBukkit.INSTANCE.getBukkitAudiences().player(event.getPlayer());
-    Sonar.AUDIENCES.put(event.getPlayer().getName(), audience);
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST)
-  public void handle(final @NotNull PlayerQuitEvent event) {
-    Sonar.AUDIENCES.remove(event.getPlayer().getName());
-  }
-}
@@ -25,7 +25,7 @@ import xyz.jonesdev.sonar.bukkit.SonarBukkit;

 public final class BukkitInvocationSource extends InvocationSource {
  public BukkitInvocationSource(final @NotNull CommandSender sender) {
-    super(sender.getName(),
+    super(sender instanceof Player ? ((Player) sender).getUniqueId() : null,
      SonarBukkit.INSTANCE.getBukkitAudiences().sender(sender),
      sender instanceof Player,
      sender::hasPermission);
@@ -19,19 +19,22 @@ package xyz.jonesdev.sonar.bungee;

 import com.alessiodp.libby.BungeeLibraryManager;
 import lombok.Getter;
+import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import org.bstats.bungeecord.Metrics;
+import org.bstats.charts.SimplePie;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.SonarPlatform;
 import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
-import xyz.jonesdev.sonar.bungee.audience.AudienceListener;
 import xyz.jonesdev.sonar.bungee.command.BungeeSonarCommand;
 import xyz.jonesdev.sonar.bungee.fallback.FallbackInjectionHelper;
 import xyz.jonesdev.sonar.bungee.fallback.FallbackLoginListener;
 import xyz.jonesdev.sonar.common.boot.SonarBootstrap;
 import xyz.jonesdev.sonar.common.statistics.CachedBandwidthStatistics;

+import java.util.UUID;
 import java.util.concurrent.TimeUnit;

@Getter
@@ -48,6 +51,14 @@ public final class SonarBungee extends SonarBootstrap<SonarBungeePlugin> {
   */
  private final BungeeAudiences bungeeAudiences = BungeeAudiences.create(getPlugin());

+  @Override
+  public @NotNull Audience audience(final @Nullable UUID uniqueId) {
+    if (uniqueId == null) {
+      return bungeeAudiences.console();
+    }
+    return bungeeAudiences.player(uniqueId);
+  }
+
  /**
   * Create a wrapper for the plugin logger, so we can use it outside
   * the velocity module.
@@ -72,11 +83,18 @@ public final class SonarBungee extends SonarBootstrap<SonarBungeePlugin> {
    }
  };

+  private Metrics metrics;
+
  @Override
  public void enable() {
-
    // Initialize bStats.org metrics
-    new Metrics(getPlugin(), getPlatform().getMetricsId());
+    metrics = new Metrics(getPlugin(), getPlatform().getMetricsId());
+
+    // Add charts for some configuration options
+    metrics.addCustomChart(new SimplePie("verification",
+      () -> getConfig().getVerification().getTiming().getDisplayName()));
+    metrics.addCustomChart(new SimplePie("captcha",
+      () -> getConfig().getVerification().getMap().getTiming().getDisplayName()));

    // Register Sonar command
    getPlugin().getServer().getPluginManager().registerCommand(getPlugin(), new BungeeSonarCommand());
@@ -84,9 +102,6 @@ public final class SonarBungee extends SonarBootstrap<SonarBungeePlugin> {
    // Register Fallback listener
    getPlugin().getServer().getPluginManager().registerListener(getPlugin(), new FallbackLoginListener());

-    // Register audience register listener
-    getPlugin().getServer().getPluginManager().registerListener(getPlugin(), new AudienceListener());
-
    // Register traffic service
    getPlugin().getServer().getScheduler().schedule(getPlugin(), CachedBandwidthStatistics::reset,
      1L, 1L, TimeUnit.SECONDS);
@@ -102,4 +117,10 @@ public final class SonarBungee extends SonarBootstrap<SonarBungeePlugin> {
    // Make sure to inject into the server's connection handler
    FallbackInjectionHelper.inject();
  }
+
+  @Override
+  public void disable() {
+    // Make sure to properly shutdown bStats metrics
+    metrics.shutdown();
+  }
 }
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2023-2024 Sonar Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package xyz.jonesdev.sonar.bungee.audience;
-
-import net.kyori.adventure.audience.Audience;
-import net.md_5.bungee.api.event.PlayerDisconnectEvent;
-import net.md_5.bungee.api.event.PostLoginEvent;
-import net.md_5.bungee.api.plugin.Listener;
-import net.md_5.bungee.event.EventHandler;
-import net.md_5.bungee.event.EventPriority;
-import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.bungee.SonarBungee;
-
-public final class AudienceListener implements Listener {
-
-  @EventHandler(priority = EventPriority.HIGHEST)
-  public void handle(final @NotNull PostLoginEvent event) {
-    final Audience audience = SonarBungee.INSTANCE.getBungeeAudiences().player(event.getPlayer());
-    Sonar.AUDIENCES.put(event.getPlayer().getName(), audience);
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST)
-  public void handle(final @NotNull PlayerDisconnectEvent event) {
-    Sonar.AUDIENCES.remove(event.getPlayer().getName());
-  }
-}
@@ -25,7 +25,7 @@ import xyz.jonesdev.sonar.bungee.SonarBungee;

 public final class BungeeInvocationSource extends InvocationSource {
  public BungeeInvocationSource(final @NotNull CommandSender sender) {
-    super(sender.getName(),
+    super(sender instanceof ProxiedPlayer ? ((ProxiedPlayer) sender).getUniqueId() : null,
      SonarBungee.INSTANCE.getBungeeAudiences().sender(sender),
      sender instanceof ProxiedPlayer,
      sender::hasPermission);
@@ -45,6 +45,7 @@ import java.util.UUID;
 import static net.md_5.bungee.netty.PipelineUtils.*;
 import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_BANDWIDTH;
 import static xyz.jonesdev.sonar.common.fallback.FallbackUserWrapper.customDisconnect;
+import static xyz.jonesdev.sonar.common.fallback.FallbackUserWrapper.deject;
 import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPreparer.*;

 public final class FallbackChannelHandler extends FallbackChannelHandlerAdapter {
@@ -98,6 +99,13 @@ public final class FallbackChannelHandler extends FallbackChannelHandlerAdapter
    }
    // Store the protocol version
    protocolVersion = ProtocolVersion.fromId(handshake.getProtocolVersion());
+    // Connections from unknown protocol versions will be discarded
+    // as this is the safest way of handling unwanted connections
+    if (protocolVersion.isUnknown()) {
+      // Sonar does NOT support snapshots or unknown versions;
+      // I'll try my best to stay up-to-date!
+      throw new CorruptedFrameException("Unknown protocol");
+    }
    // Hook the traffic listener
    // TODO: Can we implement this in channelActive?
    channel.pipeline().addFirst(FALLBACK_BANDWIDTH, FallbackBandwidthHandler.INSTANCE);
@@ -129,12 +137,14 @@ public final class FallbackChannelHandler extends FallbackChannelHandlerAdapter
    // Don't continue the verification process if the verification is disabled
    if (!Sonar.get().getFallback().shouldVerifyNewPlayers()) {
      ctx.fireChannelRead(wrappedMessage);
+      deject(channel.pipeline());
      return;
    }

    // Completely skip Geyser connections
    if (GeyserUtil.isGeyserConnection(channel, socketAddress)) {
      ctx.fireChannelRead(wrappedMessage);
+      deject(channel.pipeline());
      return;
    }

@@ -164,6 +174,7 @@ public final class FallbackChannelHandler extends FallbackChannelHandlerAdapter
    final UUID offlineUUID = UUID.nameUUIDFromBytes(offlineUUIDString.getBytes(StandardCharsets.UTF_8));
    if (Sonar.get().getVerifiedPlayerController().has(inetAddress, offlineUUID)) {
      ctx.fireChannelRead(wrappedMessage);
+      deject(channel.pipeline());
      return;
    }

@@ -177,6 +188,7 @@ public final class FallbackChannelHandler extends FallbackChannelHandlerAdapter
    if (Sonar.get().getConfig().getVerification().getWhitelistedProtocols()
      .contains(protocolVersion.getProtocol())) {
      ctx.fireChannelRead(wrappedMessage);
+      deject(channel.pipeline());
      return;
    }

@@ -1,5 +1,7 @@
 dependencies {
  compileOnly(project(":api"))
+
+  implementation("xyz.jonesdev.capja:capja:0.1.2")
 }

 java.sourceCompatibility = JavaVersion.VERSION_11
@@ -61,6 +61,14 @@ class LibraryLoader {
        .groupId("com{}mysql")
        .artifactId("mysql-connector-j")
        .version("8.3.0")
+        .relocate("com{}mysql", "xyz{}jonesdev{}sonar{}libs{}mysql")
+        .build(),
+      // MariaDB driver
+      Library.builder()
+        .groupId("org{}mariadb{}jdbc")
+        .artifactId("mariadb-java-client")
+        .version("3.3.3")
+        .relocate("org{}mariadb", "xyz{}jonesdev{}sonar{}libs{}mariadb")
        .build()
    );
  }
@@ -19,6 +19,8 @@ package xyz.jonesdev.sonar.common.boot;

 import com.alessiodp.libby.LibraryManager;
 import com.github.benmanes.caffeine.cache.Caffeine;
+import com.j256.ormlite.logger.Level;
+import com.j256.ormlite.logger.Logger;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -77,6 +79,8 @@ public abstract class SonarBootstrap<T> implements Sonar {
    this.notificationHandler = new Notification();
    this.config = new SonarConfiguration(dataDirectory);
    this.subcommandRegistry = new SubcommandRegistryHolder();
+    // Hide unnecessary debug information
+    Logger.setGlobalLogLevel(Level.WARNING);
  }

  public final void initialize() {
@@ -122,8 +126,7 @@ public abstract class SonarBootstrap<T> implements Sonar {
    // Warn player if they reloaded and changed the database type
    if (verifiedPlayerController != null
      && verifiedPlayerController.getCachedDatabaseType() != getConfig().getDatabase().getType()) {
-      getLogger().warn("Reloading the server after changing the database type"
-        + " is generally not recommended as it can sometimes cause data loss.");
+      getLogger().warn("Reloading after changing the database type is not recommended as it may cause data loss.");
    }

    // Prepare cached packets
@@ -153,14 +156,23 @@ public abstract class SonarBootstrap<T> implements Sonar {
    }

    // Reinitialize database controller
+    if (verifiedPlayerController != null) {
+      // Close the old connection first
+      verifiedPlayerController.close();
+    }
    verifiedPlayerController = new VerifiedPlayerController();
  }

-  public void shutdown() {
+  public final void shutdown() {
+    // Initialize shutdown process
    getLogger().info("Starting shutdown process...");
-
-    // ...
-
+    // Close database connection
+    verifiedPlayerController.close();
+    // Run the per-platform disable method
+    disable();
+    // Thank the user for using Sonar
    getLogger().info("Successfully shut down. Goodbye!");
  }
+
+  public abstract void disable();
 }
@@ -44,8 +44,7 @@ import java.net.InetAddress;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;

-import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_PACKET_DECODER;
-import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_PACKET_ENCODER;
+import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.*;

@Getter
@ToString(of = {"protocolVersion", "inetAddress"})
@@ -128,7 +127,7 @@ public final class FallbackUserWrapper implements FallbackUser {
  }

  @Override
-  public void fail(@Nullable String reason) {
+  public void fail(final @Nullable String reason) {
    if (channel.isActive()) {
      disconnect(Sonar.get().getConfig().getVerification().getVerificationFailed());

@@ -238,4 +237,17 @@ public final class FallbackUserWrapper implements FallbackUser {
      channel.close();
    }
  }
+
+  /**
+   * Removes Sonar's pipelines from a channel to save
+   * unnecessary RAM and CPU usage
+   *
+   * @param pipeline Pipeline object of the channel
+   */
+  public static void deject(final @NotNull ChannelPipeline pipeline) {
+    // Remove Sonar's pipelines if they exist
+    if (pipeline.get(FALLBACK_HANDLER) != null) {
+      pipeline.remove(FALLBACK_HANDLER);
+    }
+  }
 }
@@ -32,8 +32,7 @@ import xyz.jonesdev.sonar.api.model.VerifiedPlayer;
 import xyz.jonesdev.sonar.api.timer.SystemTimer;
 import xyz.jonesdev.sonar.common.fallback.protocol.*;
 import xyz.jonesdev.sonar.common.fallback.protocol.map.ItemMapType;
-import xyz.jonesdev.sonar.common.fallback.protocol.map.MapInfoPreparer;
-import xyz.jonesdev.sonar.common.fallback.protocol.map.PreparedMapInfo;
+import xyz.jonesdev.sonar.common.fallback.protocol.map.MapCaptchaInfo;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.config.FinishConfigurationPacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.login.LoginAcknowledgedPacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.play.*;
@@ -73,7 +72,7 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
  // Map captcha
  private final SystemTimer keepAlive = new SystemTimer();
  private final SystemTimer actionBar = new SystemTimer();
-  private @Nullable PreparedMapInfo captcha;
+  private @Nullable MapCaptchaInfo captcha;
  private int captchaTriesLeft;

  public enum State {
@@ -262,9 +261,9 @@ public final class FallbackVerificationHandler implements FallbackPacketListener

    // Handle incoming chat messages
    if (packet instanceof UniversalChatPacket) {
+      checkFrame(captcha != null, "Captcha not sent yet");
      final UniversalChatPacket chat = (UniversalChatPacket) packet;
-      Objects.requireNonNull(captcha);
-      if (!chat.getMessage().equals(captcha.getInfo().getAnswer())) {
+      if (!chat.getMessage().equals(captcha.getAnswer())) {
        // Captcha is incorrect
        checkFrame(captchaTriesLeft-- > 0, "failed captcha too often");
        user.write(incorrectCaptcha);
@@ -473,6 +472,8 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
      tick = 1;
      posY = -1;
      expectedTeleportId = -1;
+      // Check for ground state in the first packet
+      checkFrame(!ground, "invalid ground state");
    }

    posX = x;
@@ -533,8 +534,12 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
      if (ground) {
        // Make sure the player is actually colliding with the blocks and not only spoofing ground
        checkFrame(collisionOffsetY > -0.03, "illegal collision: " + collisionOffsetY);
-        // The player is colliding to blocks, finish verification
-        captchaOrFinish();
+        // Check if the player is not spoofing ground
+        // We cannot use checkFrame as it interferes with the CAPTCHA
+        if (collisionOffsetY > -1) {
+          // The player is colliding to blocks, finish verification
+          captchaOrFinish();
+        }
        return;
      } else {
        // Make sure the player is colliding with blocks but is sending an invalid ground state
@@ -567,27 +572,27 @@ public final class FallbackVerificationHandler implements FallbackPacketListener

  private void captchaOrFinish() {
    if (FALLBACK.shouldDoMapCaptcha()) {
-      if (MapInfoPreparer.getPreparedCAPTCHAs() == 0) {
-        // This should not happen, but we have to return if there is no captcha prepared
-        user.disconnect(Sonar.get().getConfig().getVerification().getCurrentlyPreparing());
-        return;
-      }
-      // Set the state to MAP_CAPTCHA, so we don't handle any unnecessary packets
-      state = State.MAP_CAPTCHA;
-      if (!Sonar.get().getConfig().getVerification().getGravity().isEnabled()
-        && user.getProtocolVersion().compareTo(MINECRAFT_1_18_2) >= 0) {
-        // Make sure the player escapes the 1.18.2+ "Loading terrain" screen
-        user.delayedWrite(CAPTCHA_SPAWN_POSITION);
-      }
      // Initialize the map captcha
-      handleMapCaptcha();
-    } else {
-      // Finish the verification
-      finish();
+      handleCAPTCHA();
+      return;
    }
+    // Finish the verification
+    finish();
  }

-  private void handleMapCaptcha() {
+  private void handleCAPTCHA() {
+    if (!MAP_INFO_PREPARER.isCaptchaAvailable()) {
+      // This should not happen, but we have to return if there is no captcha prepared
+      user.disconnect(Sonar.get().getConfig().getVerification().getCurrentlyPreparing());
+      return;
+    }
+    // Set the state to MAP_CAPTCHA, so we don't handle any unnecessary packets
+    state = State.MAP_CAPTCHA;
+    if (!Sonar.get().getConfig().getVerification().getGravity().isEnabled()
+      && user.getProtocolVersion().compareTo(MINECRAFT_1_18_2) >= 0) {
+      // Make sure the player escapes the 1.18.2+ "Loading terrain" screen
+      user.delayedWrite(CAPTCHA_SPAWN_POSITION);
+    }
    // Reset max tries
    captchaTriesLeft = Sonar.get().getConfig().getVerification().getMap().getMaxTries();

@@ -595,8 +600,8 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
    user.delayedWrite(new SetSlotPacket(0, 36, 1, 0,
      ItemMapType.FILLED_MAP.getId(user.getProtocolVersion()), SetSlotPacket.MAP_NBT));
    // Send random captcha to the player
-    captcha = MapInfoPreparer.getRandomCaptcha();
-    Objects.requireNonNull(captcha).write(user);
+    captcha = MAP_INFO_PREPARER.getRandomCaptcha();
+    Objects.requireNonNull(captcha).delayedWrite(user);
    // Teleport the player to the position above the platform
    user.delayedWrite(CAPTCHA_POSITION);
    // Make sure the player cannot move
@@ -608,6 +613,9 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
  }

  private void finish() {
+    // Something must've gone horribly wrong...
+    if (state == State.SUCCESS) return;
+
    state = State.SUCCESS;

    // Increment amount of total successful verifications
@@ -646,6 +654,11 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
   */
  private void checkFrame(final boolean condition, final String message) {
    if (!condition) {
+      if (state == State.POSITION // Gravity check
+        && Sonar.get().getConfig().getVerification().getGravity().isCaptchaOnFail()) {
+        handleCAPTCHA();
+        return;
+      }
      user.fail(message);
      throw new CorruptedFrameException(message);
    }
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.common.fallback.protocol.netty;
+package xyz.jonesdev.sonar.common.fallback.netty;

 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufHolder;
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.common.fallback.protocol.netty;
+package xyz.jonesdev.sonar.common.fallback.netty;

 import org.jetbrains.annotations.NotNull;

@@ -98,10 +98,6 @@ public final class FallbackPacketDecoder extends ChannelInboundHandlerAdapter {
        // Release the ByteBuf to avoid memory leaks
        byteBuf.release();
      }
-    } else {
-      // Packets are always ByteBufs - if we detect an unknown object, fail verification
-      user.fail("packet is not a ByteBuf");
-      throw new CorruptedFrameException("Packet is not a ByteBuf?!");
    }
  }

@@ -373,7 +373,7 @@ public enum FallbackPacketRegistry {
    PacketRegistry() {
      final Map<ProtocolVersion, ProtocolRegistry> mutableVersions = new EnumMap<>(ProtocolVersion.class);
      for (final ProtocolVersion version : ProtocolVersion.values()) {
-        if (!version.isLegacy() && !version.isUnknown()) {
+        if (!version.isUnknown()) {
          mutableVersions.put(version, new ProtocolRegistry(version));
        }
      }
@@ -23,7 +23,7 @@ import xyz.jonesdev.sonar.api.config.SonarConfiguration;
 import xyz.jonesdev.sonar.common.fallback.protocol.block.BlockPosition;
 import xyz.jonesdev.sonar.common.fallback.protocol.block.BlockType;
 import xyz.jonesdev.sonar.common.fallback.protocol.block.ChangedBlock;
-import xyz.jonesdev.sonar.common.fallback.protocol.map.MapInfoPreparer;
+import xyz.jonesdev.sonar.common.fallback.protocol.map.CaptchaPreparer;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.config.FinishConfigurationPacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.config.RegistryDataPacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.play.*;
@@ -82,17 +82,15 @@ public class FallbackPreparer {
  public double[] preparedCachedYMotions;
  public double maxFallDistance;

+  // CAPTCHA
+  public final CaptchaPreparer MAP_INFO_PREPARER = new CaptchaPreparer();
+
  public void prepare() {
-    joinGame = new JoinGamePacket(0,
+    joinGame = new JoinGamePacket(1,
      Sonar.get().getConfig().getVerification().getGravity().getGamemode().getId(),
-      0,
-      false,
-      0,
-      true,
-      true,
-      false,
-      new String[]{"minecraft:overworld"},
-      "minecraft:overworld");
+      0, false, 0,
+      true, false, false,
+      new String[]{"minecraft:overworld"}, "minecraft:overworld");

    maxFallDistance = 0;
    maxMovementTick = Sonar.get().getConfig().getVerification().getGravity().getMaxMovementTicks();
@@ -133,12 +131,13 @@ public class FallbackPreparer {
    invalidUsername = DisconnectPacket.create(Sonar.get().getConfig().getVerification().getInvalidUsername(), true);

    // Precompute captcha answers
-    if (Sonar.get().getConfig().getVerification().getMap().getTiming() != SonarConfiguration.Verification.Timing.NEVER) {
+    if (Sonar.get().getConfig().getVerification().getMap().getTiming() != SonarConfiguration.Verification.Timing.NEVER
+      || Sonar.get().getConfig().getVerification().getGravity().isCaptchaOnFail()) {
      enterCodeMessage = new UniversalChatPacket(Sonar.get().getConfig().getVerification().getMap().getEnterCode(), UniversalChatPacket.SYSTEM_TYPE);
      incorrectCaptcha = new UniversalChatPacket(
        Sonar.get().getConfig().getVerification().getMap().getFailedCaptcha(), UniversalChatPacket.SYSTEM_TYPE);

-      MapInfoPreparer.prepare();
+      MAP_INFO_PREPARER.prepare();
    }
  }
 }
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2023-2024 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.jonesdev.sonar.common.fallback.protocol.map;
+
+import xyz.jonesdev.capja.CaptchaGenerator;
+import xyz.jonesdev.capja.CaptchaHolder;
+import xyz.jonesdev.capja.config.CaptchaConfiguration;
+import xyz.jonesdev.sonar.api.Sonar;
+import xyz.jonesdev.sonar.api.config.SonarConfiguration;
+import xyz.jonesdev.sonar.api.timer.SystemTimer;
+
+import java.awt.*;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public final class CaptchaPreparer {
+  private static final ExecutorService PREPARATION_SERVICE = Executors.newSingleThreadExecutor();
+  private static final Random RANDOM = new Random();
+
+  private MapCaptchaInfo[] cached;
+  private int preparedAmount;
+
+  public void prepare() {
+    // Make sure we're not preparing when Sonar is already preparing answers
+    if (cached != null && preparedAmount != cached.length) return;
+    preparedAmount = 0;
+
+    final SystemTimer timer = new SystemTimer();
+    Sonar.get().getLogger().info("Asynchronously preparing CAPTCHA answers...");
+    Sonar.get().getLogger().info("Players will be able to join even if the preparation isn't finished");
+
+    // Prepare cache
+    final SonarConfiguration.Verification.Map config = Sonar.get().getConfig().getVerification().getMap();
+    cached = new MapCaptchaInfo[config.getPrecomputeAmount()];
+
+    // Prepare everything asynchronously
+    PREPARATION_SERVICE.execute(() -> {
+      final List<String> fonts = config.getFonts();
+      if (fonts.isEmpty()) {
+        throw new IllegalArgumentException("No fonts specified!");
+      }
+
+      // Create the configuration for the image generation
+      final String[] fontNames = fonts.toArray(new String[0]);
+      final CaptchaConfiguration configuration = new CaptchaConfiguration(
+        128, 128, config.getDictionary().toCharArray(), 5,
+        config.isFlare(), config.isScratches(), config.isRipple(), config.isSmear(), config.isPinch(),
+        config.getSaturation(), config.getDistortion(), new int[]{Font.PLAIN, Font.BOLD}, fontNames);
+
+      for (int i = 0; i < config.getPrecomputeAmount(); i++) {
+        final CaptchaGenerator captchaGenerator = new CaptchaGenerator(configuration);
+        final CaptchaHolder captchaHolder = captchaGenerator.generate();
+        final byte[] buffer = MapColorPalette.getBufferFromImage(captchaHolder.getImage());
+        cached[i] = new MapCaptchaInfo(captchaHolder.getAnswer(), buffer);
+        preparedAmount++;
+      }
+
+      Sonar.get().getLogger().info("Finished preparing {} CAPTCHA answers ({}s)!", preparedAmount, timer);
+    });
+  }
+
+  public boolean isCaptchaAvailable() {
+    return cached != null && cached[0] != null;
+  }
+
+  public MapCaptchaInfo getRandomCaptcha() {
+    // Give the player a random CAPTCHA out of the ones that we've already prepared
+    return cached[RANDOM.nextInt(preparedAmount)];
+  }
+}
@@ -25,41 +25,41 @@ import xyz.jonesdev.sonar.common.fallback.protocol.packets.play.MapDataPacket;
 import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.MINECRAFT_1_8;

@Getter
-public final class PreparedMapInfo {
-  public static final int DIMENSIONS = (int) Math.pow(2, 7);
-  public static final int SCALE = DIMENSIONS * DIMENSIONS;
+public final class MapCaptchaInfo {
+  private final String answer;
+  private final byte[] buffer;

-  private final MapInfo info;
  private final MapDataPacket[] legacy;
  private final MapDataPacket modern;

-  public PreparedMapInfo(final String answer,
-                         final int columns, final int rows,
-                         final byte @NotNull [] buffer) {
-    this.info = new MapInfo(answer, columns, rows, 0, 0, buffer);
+  public MapCaptchaInfo(final @NotNull String answer, final byte @NotNull [] buffer) {
+    this.answer = answer;
+    this.buffer = buffer;

    // Prepare 1.7 map data using a grid
-    final byte[][] grid = new byte[DIMENSIONS][DIMENSIONS];
+    final byte[][] grid = new byte[128][128];
    for (int i = 0; i < buffer.length; i++) {
      final byte buf = buffer[i];
      grid[i & Byte.MAX_VALUE][i >> 7] = buf;
    }
    this.legacy = new MapDataPacket[grid.length];
    for (int i = 0; i < grid.length; i++) {
-      this.legacy[i] = new MapDataPacket(new MapInfo(answer, DIMENSIONS, DIMENSIONS, i, 0, grid[i]));
+      this.legacy[i] = new MapDataPacket(grid[i], i, 0);
    }

    // Prepare 1.8+ map data
-    this.modern = new MapDataPacket(info);
+    this.modern = new MapDataPacket(buffer, 0, 0);
  }

-  public void write(final @NotNull FallbackUser user) {
-    if (user.getProtocolVersion().compareTo(MINECRAFT_1_8) < 0) {
-      for (final MapDataPacket data : legacy) {
-        user.delayedWrite(data);
-      }
-    } else {
+  public void delayedWrite(final @NotNull FallbackUser user) {
+    if (user.getProtocolVersion().compareTo(MINECRAFT_1_8) >= 0) {
      user.delayedWrite(modern);
+      return;
+    }
+
+    // 1.7.2-1.7.10
+    for (final MapDataPacket legacyPacket : legacy) {
+      user.delayedWrite(legacyPacket);
    }
  }
 }
@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2023-2024 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.jonesdev.sonar.common.fallback.protocol.map;
+
+import lombok.experimental.UtilityClass;
+import org.jetbrains.annotations.NotNull;
+
+import java.awt.image.BufferedImage;
+
+@UtilityClass
+public class MapColorPalette {
+  // https://minecraft.wiki/w/Map_item_format#Full_color_tables
+  public static final int[] COLOR_MAP = {
+    0,
+    0,
+    0,
+    0,
+    -10912473,
+    -9594576,
+    -8408520,
+    -12362211,
+    -5331853,
+    -2766452,
+    -530013,
+    -8225962,
+    -7697782,
+    -5658199,
+    -3815995,
+    -9934744,
+    -4980736,
+    -2359296,
+    -65536,
+    -7929856,
+    -9408332,
+    -7697700,
+    -6250241,
+    -11250553,
+    -9079435,
+    -7303024,
+    -5789785,
+    -10987432,
+    -16754944,
+    -16750080,
+    -16745472,
+    -16760576,
+    -4934476,
+    -2302756,
+    -1,
+    -7895161,
+    -9210239,
+    -7499618,
+    -5986120,
+    -11118495,
+    -8304095,
+    -6464728,
+    -4756945,
+    -10471400,
+    -11579569,
+    -10461088,
+    -9408400,
+    -12895429,
+    -10136525,
+    -8689858,
+    -7375032,
+    -11780314,
+    -13816396,
+    -13158436,
+    -12566273,
+    -14605945,
+    -4935252,
+    -2303533,
+    -779,
+    -7895679,
+    -6792924,
+    -4559572,
+    -2588877,
+    -9288933,
+    -8571496,
+    -6733382,
+    -5092136,
+    -10606478,
+    -12030824,
+    -10976070,
+    -10053160,
+    -13217422,
+    -6184668,
+    -3816148,
+    -1710797,
+    -8816357,
+    -10907631,
+    -9588715,
+    -8401895,
+    -12358643,
+    -5613196,
+    -3117682,
+    -884827,
+    -8371369,
+    -13290187,
+    -12500671,
+    -11776948,
+    -14145496,
+    -9671572,
+    -8092540,
+    -6710887,
+    -11447983,
+    -13280916,
+    -12489340,
+    -11763815,
+    -14138543,
+    -10933123,
+    -9619815,
+    -8437838,
+    -12377762,
+    -14404227,
+    -13876839,
+    -13415246,
+    -14997410,
+    -12045020,
+    -10993364,
+    -10073037,
+    -13228005,
+    -12035804,
+    -10982100,
+    -10059981,
+    -13221093,
+    -9690076,
+    -8115156,
+    -6737101,
+    -11461861,
+    -15658735,
+    -15395563,
+    -15132391,
+    -15921907,
+    -5199818,
+    -2634430,
+    -332211,
+    -8094168,
+    -12543338,
+    -11551561,
+    -10691627,
+  };
+
+  public byte[] getBufferFromImage(final @NotNull BufferedImage bufferedImage) {
+    final int width = bufferedImage.getWidth();
+    final int height = bufferedImage.getHeight();
+
+    final int[] pixels = new int[128 * 128];
+    final byte[] buffer = new byte[128 * 128];
+
+    bufferedImage.getRGB(0, 0, width, height, pixels, 0, width);
+
+    for (int i = 0; i < pixels.length; i++) {
+      buffer[i] = mapColorToMinecraft(pixels[i]);
+    }
+    return buffer;
+  }
+
+  private byte mapColorToMinecraft(final int argb) {
+    int minDistance = Integer.MAX_VALUE;
+    byte closestIndex = 0;
+    for (byte i = 0; i < COLOR_MAP.length; i++) {
+      final int distance = calculateColorDistance(argb, COLOR_MAP[i]);
+      if (distance < minDistance) {
+        minDistance = distance;
+        closestIndex = i;
+      }
+    }
+    return closestIndex;
+  }
+
+  private int calculateColorDistance(final int argb0, final int argb1) {
+    final int red0 = (argb0 >> 16) & 0xFF;
+    final int green0 = (argb0 >> 8) & 0xFF;
+    final int blue0 = argb0 & 0xFF;
+    final int red1 = (argb1 >> 16) & 0xFF;
+    final int green1 = (argb1 >> 8) & 0xFF;
+    final int blue1 = argb1 & 0xFF;
+    // Color distance metric (e.g. squared Euclidean distance)
+    return (red0 - red1) * (red0 - red1)
+      + (green0 - green1) * (green0 - green1)
+      + (blue0 - blue1) * (blue0 - blue1);
+  }
+}
@@ -1,248 +0,0 @@
-/*
- * Copyright (C) 2023-2024 Sonar Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package xyz.jonesdev.sonar.common.fallback.protocol.map;
-
-import lombok.Getter;
-import lombok.experimental.UtilityClass;
-import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.config.SonarConfiguration;
-import xyz.jonesdev.sonar.api.timer.SystemTimer;
-
-import java.awt.*;
-import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphVector;
-import java.awt.geom.AffineTransform;
-import java.awt.image.BufferedImage;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import static java.awt.Font.*;
-import static xyz.jonesdev.sonar.common.fallback.protocol.map.PreparedMapInfo.DIMENSIONS;
-
-@UtilityClass
-public class MapInfoPreparer {
-  private final Random RANDOM = new Random();
-
-  private final ExecutorService PREPARATION_SERVICE = Executors.newSingleThreadExecutor();
-
-  private final int[] FONT_STYLES = new int[]{
-    PLAIN,
-    BOLD,
-    ITALIC,
-    ITALIC | BOLD
-  };
-
-  private final int[][] COLOR_PALETTE = new int[][]{
-    new int[]{ // Blue
-      48,
-      49,
-      50,
-      51
-    },
-    new int[]{ // Orange
-      60,
-      61,
-      62,
-      63,
-    },
-    new int[]{ // Green
-      4,
-      28,
-      29,
-      30,
-    },
-    new int[]{ // Black
-      27,
-      45,
-      46,
-      47,
-    },
-    new int[]{ // Red
-      16,
-      17,
-      18,
-      19
-    }
-  };
-
-  private PreparedMapInfo[] cached;
-  @Getter
-  private int preparedCAPTCHAs;
-  private boolean currentlyPreparing;
-
-  public PreparedMapInfo getRandomCaptcha() {
-    return cached[RANDOM.nextInt(preparedCAPTCHAs)];
-  }
-
-  public void prepare() {
-    final SystemTimer timer = new SystemTimer();
-    Sonar.get().getLogger().info("Precomputing map captcha answers...");
-
-    // Make sure we're not running into concurrency issues
-    if (currentlyPreparing) {
-      Sonar.get().getLogger().warn("Did not precompute map captcha answers as another task is running.");
-      return;
-    }
-
-    // Reset all statistics
-    preparedCAPTCHAs = 0;
-    currentlyPreparing = true;
-    final SonarConfiguration.Verification.Map config = Sonar.get().getConfig().getVerification().getMap();
-    cached = null;
-    cached = new PreparedMapInfo[config.getPrecomputeAmount()];
-
-    // Prepare fonts from config
-    final String dictionary = config.getDictionary();
-    final List<String> fonts = config.getFonts();
-    if (fonts.isEmpty()) {
-      Sonar.get().getLogger().warn("No fonts found, using fallback font...");
-      fonts.add(DIALOG);
-    }
-    final String[] fontTypes = fonts.toArray(new String[0]);
-
-    // Prepare distortions values from config
-    final double distortionsFactorX = config.getDistortionsFactorX();
-    final double distortionsFactorY = config.getDistortionsFactorY();
-    final double halfDistortionsFactorX = distortionsFactorX / 2D;
-    final double halfDistortionsFactorY = distortionsFactorY / 2D;
-
-    for (int _i = 0; _i < cached.length; _i++) {
-      final int currentIndex = _i;
-      final byte[] buffer = new byte[PreparedMapInfo.SCALE];
-      PREPARATION_SERVICE.execute(() -> {
-        // Create image
-        final BufferedImage image = new BufferedImage(DIMENSIONS, DIMENSIONS, BufferedImage.TYPE_3BYTE_BGR);
-        final Graphics2D graphics = (Graphics2D) image.getGraphics();
-        try {
-          // Create random font
-          final String fontType = fontTypes[RANDOM.nextInt(fontTypes.length)];
-          final int fontStyle = FONT_STYLES[RANDOM.nextInt(FONT_STYLES.length)];
-          final int fontSize = 27
-            + (config.isRandomizeFontSize()
-            ? RANDOM.nextInt(6) - 2 : 5);
-          @SuppressWarnings("all") final Font answerFont = new Font(fontType, fontStyle, fontSize);
-          graphics.setFont(answerFont);
-
-          // Build answer to the captcha
-          final StringBuilder answerBuilder = new StringBuilder();
-          for (int _j = 0; _j < 5; _j++) {
-            answerBuilder.append(dictionary.charAt(RANDOM.nextInt(dictionary.length())));
-          }
-          final String answer = answerBuilder.toString();
-
-          // Calculate text position
-          final int stringWidth = graphics.getFontMetrics().stringWidth(answer);
-          final int halfWidth = image.getWidth() / 2;
-          final int halfHeight = image.getHeight() / 2;
-          final int spacing = 5;
-          double _x = halfWidth - stringWidth / 2f - spacing;
-          double _y = halfHeight + fontSize / 3f;
-
-          // Draw each character one by one
-          final FontRenderContext fontRenderContext = graphics.getFontRenderContext();
-          for (final char c : answer.toCharArray()) {
-            // Randomize x and y
-            if (config.isRandomizePositions()) {
-              _y += RANDOM.nextInt(8) - 4;
-            }
-
-            // Apply random distortion
-            final double distortionFactorX = RANDOM.nextDouble() * distortionsFactorX - halfDistortionsFactorX;
-            final double distortionFactorY = RANDOM.nextDouble() * distortionsFactorY - halfDistortionsFactorY;
-
-            // Create a GlyphVector for the character
-            final String character = String.valueOf(c);
-            final GlyphVector glyphVector = graphics.getFont().createGlyphVector(fontRenderContext, character);
-
-            // Apply the distortion to the GlyphVector using AffineTransform
-            final AffineTransform transform = AffineTransform.getTranslateInstance(_x, _y);
-            transform.shear(distortionFactorX, distortionFactorY);
-            final Shape distortedCharacter = glyphVector.getOutline();
-            final Shape distorted = transform.createTransformedShape(distortedCharacter);
-
-            // Draw the distorted character
-            graphics.fill(distorted);
-
-            // Update x by width
-            _x += glyphVector.getVisualBounds().getWidth() + spacing;
-          }
-
-          // TODO: Color converter
-          graphics.setColor(Color.RED);
-
-          // Draw random lines
-          for (int i = 0; i < config.getRandomLinesAmount(); i++) {
-            final int startX = RANDOM.nextInt(halfWidth);
-            final int startY = RANDOM.nextInt(halfHeight);
-            final int endX = halfWidth + RANDOM.nextInt(halfWidth);
-            final int endY = halfHeight + RANDOM.nextInt(halfHeight);
-
-            graphics.drawLine(startX, startY, endX, endY);
-          }
-
-          // Draw random ovals
-          for (int i = 0; i < config.getRandomOvalsAmount(); i++) {
-            final int startX = RANDOM.nextInt(halfWidth);
-            final int startY = RANDOM.nextInt(halfHeight);
-            final int endX = halfWidth + RANDOM.nextInt(halfWidth);
-            final int endY = halfHeight + RANDOM.nextInt(halfHeight);
-
-            graphics.drawOval(startX, startY, endX, endY);
-          }
-
-          // Select random color palette
-          final int[] colorPalette = COLOR_PALETTE[currentIndex % COLOR_PALETTE.length];
-          // Select the next color palette for geometry
-          final int[] nextColorPalette = COLOR_PALETTE[(currentIndex + 1) % COLOR_PALETTE.length];
-          // Clear background
-          Arrays.fill(buffer, (byte) 57);
-          // Color every pixel individually
-          final int spacingY = halfHeight - fontSize;
-          for (int x = spacing; x < image.getWidth() - spacing; x++) {
-            for (int y = spacingY; y < image.getHeight() - spacingY; y++) {
-              final int pixel = image.getRGB(x, y);
-              final int index = y * image.getWidth() + x;
-              if (pixel == -16777216 && RANDOM.nextInt(100) < 97) continue;
-              // Set color of pixel to random color from the palette
-              final byte color = (byte) (pixel == -16777216 ? RANDOM.nextInt(100) < 75 ? 14 :
-                RANDOM.nextInt(Byte.MAX_VALUE)
-                : pixel != -65536 ? colorPalette[RANDOM.nextInt(colorPalette.length)]
-                : nextColorPalette[RANDOM.nextInt(nextColorPalette.length)]);
-              // Write pixel color to buffer
-              buffer[index] = color;
-            }
-          }
-          // Cache buffer to map
-          cached[currentIndex] = new PreparedMapInfo(answer, image.getWidth(), image.getHeight(), buffer);
-        } finally {
-          // Dispose graphics
-          graphics.dispose();
-          // Finished?
-          if (currentIndex == cached.length - 1) {
-            Sonar.get().getLogger().info("Successfully precomputed map captcha answers in {}s!", timer);
-            currentlyPreparing = false;
-          }
-          preparedCAPTCHAs++;
-        }
-      });
-    }
-  }
-}
@@ -30,4 +30,10 @@ public final class LoginAcknowledgedPacket implements FallbackPacket {
  @Override
  public void decode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
  }
+
+  @Override
+  public int expectedMaxLength(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+    // https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/LoginAcknowledgedPacket.java#L41
+    return 0;
+  }
 }
@@ -21,10 +21,11 @@ import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.common.fallback.netty.FastUUID;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
-import xyz.jonesdev.sonar.common.fallback.protocol.netty.FastUUID;

 import java.util.UUID;

@@ -33,6 +34,7 @@ import static xyz.jonesdev.sonar.common.utility.protocol.ProtocolUtil.*;
 import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.writeVarInt;

@Getter
+@ToString
@NoArgsConstructor
@AllArgsConstructor
 public final class LoginSuccessPacket implements FallbackPacket {
@@ -57,6 +57,7 @@ public final class JoinGamePacket implements FallbackPacket {
      byteBuf.writeByte(0); // difficulty
      byteBuf.writeByte(0); // max players
      writeString(byteBuf, "flat"); // level type
+      return;
    }

    if (protocolVersion.inBetween(MINECRAFT_1_8, MINECRAFT_1_9)) {
@@ -66,6 +67,7 @@ public final class JoinGamePacket implements FallbackPacket {
      byteBuf.writeByte(0); // max players
      writeString(byteBuf, "flat"); // level type
      byteBuf.writeBoolean(reducedDebugInfo);
+      return;
    }

    if (protocolVersion.inBetween(MINECRAFT_1_9_1, MINECRAFT_1_13_2)) {
@@ -75,6 +77,7 @@ public final class JoinGamePacket implements FallbackPacket {
      byteBuf.writeByte(0); // max players
      writeString(byteBuf, "flat"); // level type
      byteBuf.writeBoolean(reducedDebugInfo);
+      return;
    }

    if (protocolVersion.inBetween(MINECRAFT_1_14, MINECRAFT_1_14_4)) {
@@ -84,6 +87,7 @@ public final class JoinGamePacket implements FallbackPacket {
      writeString(byteBuf, "flat"); // level type
      writeVarInt(byteBuf, viewDistance);
      byteBuf.writeBoolean(reducedDebugInfo);
+      return;
    }

    if (protocolVersion.inBetween(MINECRAFT_1_15, MINECRAFT_1_15_2)) {
@@ -95,6 +99,7 @@ public final class JoinGamePacket implements FallbackPacket {
      writeVarInt(byteBuf, viewDistance);
      byteBuf.writeBoolean(reducedDebugInfo);
      byteBuf.writeBoolean(showRespawnScreen);
+      return;
    }

    if (protocolVersion.inBetween(MINECRAFT_1_16, MINECRAFT_1_16_1)) {
@@ -111,6 +116,7 @@ public final class JoinGamePacket implements FallbackPacket {
      byteBuf.writeBoolean(showRespawnScreen);
      byteBuf.writeBoolean(false); // debug type
      byteBuf.writeBoolean(false); // flat
+      return;
    }

    if (protocolVersion.inBetween(MINECRAFT_1_16_2, MINECRAFT_1_17_1)) {
@@ -128,6 +134,7 @@ public final class JoinGamePacket implements FallbackPacket {
      byteBuf.writeBoolean(showRespawnScreen);
      byteBuf.writeBoolean(false); // debug type
      byteBuf.writeBoolean(false); // flat
+      return;
    }

    if (protocolVersion.inBetween(MINECRAFT_1_18, MINECRAFT_1_18_2)) {
@@ -151,6 +158,7 @@ public final class JoinGamePacket implements FallbackPacket {
      byteBuf.writeBoolean(showRespawnScreen);
      byteBuf.writeBoolean(false); // debug type
      byteBuf.writeBoolean(false); // flat
+      return;
    }

    if (protocolVersion.inBetween(MINECRAFT_1_19, MINECRAFT_1_19_4)) {
@@ -178,6 +186,7 @@ public final class JoinGamePacket implements FallbackPacket {
      byteBuf.writeBoolean(false); // debug type
      byteBuf.writeBoolean(false); // flat
      byteBuf.writeBoolean(false); // no last death location
+      return;
    }

    if (protocolVersion.equals(MINECRAFT_1_20)) {
@@ -198,6 +207,7 @@ public final class JoinGamePacket implements FallbackPacket {
      byteBuf.writeBoolean(false); // flat
      byteBuf.writeBoolean(false); // no last death location
      writeVarInt(byteBuf, 0);
+      return;
    }

    if (protocolVersion.compareTo(MINECRAFT_1_20_2) >= 0) {
@@ -25,7 +25,6 @@ import lombok.ToString;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
-import xyz.jonesdev.sonar.common.fallback.protocol.map.MapInfo;

 import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.writeVarInt;

@@ -34,19 +33,20 @@ import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.writeVarInt;
@NoArgsConstructor
@AllArgsConstructor
 public final class MapDataPacket implements FallbackPacket {
-  private MapInfo mapInfo;
+  private byte[] buffer;
+  private int x, y;

  @Override
  public void encode(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
    writeVarInt(byteBuf, 0);

    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_8) < 0) {
-      byteBuf.writeShort(mapInfo.getBuffer().length + 3);
+      byteBuf.writeShort(buffer.length + 3);
      byteBuf.writeByte(0); // scaling
-      byteBuf.writeByte(mapInfo.getX());
-      byteBuf.writeByte(mapInfo.getY());
+      byteBuf.writeByte(x);
+      byteBuf.writeByte(y);

-      byteBuf.writeBytes(mapInfo.getBuffer());
+      byteBuf.writeBytes(buffer);
    } else {
      byteBuf.writeByte(0); // scaling

@@ -65,13 +65,13 @@ public final class MapDataPacket implements FallbackPacket {
        writeVarInt(byteBuf, 0);
      }

-      byteBuf.writeByte(mapInfo.getColumns());
-      byteBuf.writeByte(mapInfo.getRows());
-      byteBuf.writeByte(mapInfo.getX());
-      byteBuf.writeByte(mapInfo.getY());
+      byteBuf.writeByte(128); // rows
+      byteBuf.writeByte(128); // columns
+      byteBuf.writeByte(x);
+      byteBuf.writeByte(y);

-      writeVarInt(byteBuf, mapInfo.getBuffer().length);
-      byteBuf.writeBytes(mapInfo.getBuffer());
+      writeVarInt(byteBuf, buffer.length);
+      byteBuf.writeBytes(buffer);
    }
  }

@@ -22,8 +22,8 @@ import lombok.Getter;
 import lombok.ToString;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.common.fallback.netty.DeferredByteBufHolder;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
-import xyz.jonesdev.sonar.common.fallback.protocol.netty.DeferredByteBufHolder;

 import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.MINECRAFT_1_13;
 import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.MINECRAFT_1_8;
@@ -42,17 +42,17 @@ public final class PluginMessagePacket extends DeferredByteBufHolder implements

  @Override
  public int expectedMinLength(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
-    return 8;
+    return 4;
  }

  @Override
  public int expectedMaxLength(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
-    return 0xfff + 1; // limit packet size to 4096
+    return 0xFFF; // strict size limit
  }

  @Override
  public void decode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
-    channel = readString(byteBuf);
+    channel = readString(byteBuf, 512);

    if (protocolVersion.compareTo(MINECRAFT_1_13) >= 0) {
      channel = transformLegacyToModernChannel(channel);
@@ -24,28 +24,31 @@ import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.statistics.SonarStatistics;

 import java.time.Duration;
+import java.util.concurrent.atomic.AtomicInteger;

 public final class GlobalSonarStatistics implements SonarStatistics {
-  private static final Cache<Long, Byte> LOGINS_PER_SECOND = Caffeine.newBuilder()
+  private static final Cache<Integer, Byte> LOGINS_PER_SECOND = Caffeine.newBuilder()
    .expireAfterWrite(Duration.ofSeconds(1))
    .build();

-  private static final Cache<Long, Byte> CONNECTIONS_PER_SECOND = Caffeine.newBuilder()
+  private static final Cache<Integer, Byte> CONNECTIONS_PER_SECOND = Caffeine.newBuilder()
    .expireAfterWrite(Duration.ofSeconds(1))
    .build();

+  private static final AtomicInteger ACTION_COUNTER = new AtomicInteger(Integer.MIN_VALUE);
+
  /**
   * Helper methods that make it easier to count new statistics
   */

  @ApiStatus.Internal
  public static void countConnection() {
-    CONNECTIONS_PER_SECOND.put(System.nanoTime(), (byte) 0);
+    CONNECTIONS_PER_SECOND.put(ACTION_COUNTER.getAndIncrement(), (byte) 0);
  }

  @ApiStatus.Internal
  public static void countLogin() {
-    LOGINS_PER_SECOND.put(System.nanoTime(), (byte) 0);
+    LOGINS_PER_SECOND.put(ACTION_COUNTER.getAndIncrement(), (byte) 0);
    totalJoinedPlayers++;
  }

@@ -31,13 +31,13 @@ public final class NotifyCommand extends Subcommand {

  @Override
  protected void execute(final @NotNull CommandInvocation invocation) {
-    if (SONAR.getNotificationHandler().isSubscribed(invocation.getSender().getName())) {
-      SONAR.getNotificationHandler().unsubscribe(invocation.getSender().getName());
+    if (SONAR.getNotificationHandler().isSubscribed(invocation.getSender().getUuid())) {
+      SONAR.getNotificationHandler().unsubscribe(invocation.getSender().getUuid());
      invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getNotificationsUnsubscribed());
      return;
    }

    invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getNotificationsSubscribed());
-    SONAR.getNotificationHandler().subscribe(invocation.getSender().getName());
+    SONAR.getNotificationHandler().subscribe(invocation.getSender().getUuid());
  }
 }
@@ -32,8 +32,8 @@ public final class VerboseCommand extends Subcommand {

  @Override
  protected void execute(final @NotNull CommandInvocation invocation) {
-    if (SONAR.getVerboseHandler().isSubscribed(invocation.getSender().getName())) {
-      SONAR.getVerboseHandler().unsubscribe(invocation.getSender().getName());
+    if (SONAR.getVerboseHandler().isSubscribed(invocation.getSender().getUuid())) {
+      SONAR.getVerboseHandler().unsubscribe(invocation.getSender().getUuid());
      invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getVerboseUnsubscribed());
      // Reset ActionBar component when unsubscribing
      invocation.getSender().getAudience().sendActionBar(Component.empty());
@@ -41,6 +41,6 @@ public final class VerboseCommand extends Subcommand {
    }

    invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getVerboseSubscribed());
-    SONAR.getVerboseHandler().subscribe(invocation.getSender().getName());
+    SONAR.getVerboseHandler().subscribe(invocation.getSender().getUuid());
  }
 }
@@ -40,7 +40,7 @@ attack-tracker:
 # Nicméně, IP adresy nemůžou být vystopovány zpátky k hráči, protože Sonar používá UUID na ukládní místo jmeno hráčů
 database:
  # Typy datábázi se kterýma Sonar bude pracovat
-  # Typy: NONE, MYSQL (Žádný, MYSQL)
+  # Typy: NONE, MYSQL, MARIADB
  type: NONE
  # Host adresa pro verifikování hráčů s SQL databází
  host: localhost
@@ -78,6 +78,8 @@ verification:
      enabled: true
      # Měl by Sonar zkoušet jestli se hráč dotýka bloku? (Doporučováno)
      check-collisions: true
+      # Měl by Sonar přimět hráče, aby vyřešil CAPTCHA, pokud neuspějí při kontrole gravitace?
+      captcha-on-fail: false
      # Maximální počet ticků, který má hráč padat aby byl puštěn na verifikační platformu
      max-movement-ticks: 8
      # Maximum ignorovaných změn Y-nové souřadnice hráče, aby neprošel verifikací
@@ -97,34 +99,39 @@ verification:
      # - DURING_ATTACK: Noví hráči dostanou map captchu jenom při útoku
      # - NEVER: Noví hráči nikdy nedostanou map CAPTCHU (Doporučeno)
      timing: NEVER
-      # Měl by Sonar randomizovat pozici X a Y na CAPTCHE?
-      random-position: true
-      # Jak moc by měl Sonar znehodnotit charaktery (faktor pro randomizaci)
-      distortions-factor-x: 50
-      distortions-factor-y: 50
-      # Kolik náhodných čar by měl Sonar vykreslit za CAPTCHOU
-      random-lines: 4
-      # Kolik náhodných oválů by měl Sonar vykreslit za CAPTCHOU
-      random-ovals: 1
-      # Měl by Sonar randomizovat font pro vykreslování textu v CAPTCHE?
-      random-font-size: true
+      # Options for the effects on the image shown to the player
+      effects:
+        # Adds a glow effect to the image
+        flare: true
+        # Adds random lines to the image
+        scratches: true
+        # Applies a ripple (sine) distortion filter
+        ripple: true
+        # Applies a horizontal distortion filter
+        smear: true
+        # Adds a bit of blurriness/distortion to the image
+        pinch: true
+        # Applies color correction (color saturation)
+        saturation: 0.15
+        # Applies a horizontal triangular ripple filter
+        distortion: 2
      # Kolik odpovědí by měl Sonar předgenerovat?
-      # Tento úkol běží souběžně v pozadí;
-      # Hráči jsou schopni se připojit pokud je CAPTCHA připravena
-      precompute: 1000
+      # Tento úkol běží souběžně v pozadí
+      precompute: 500
      # Jak dlouho by měl Sonar čekat než hráč selže CAPTCHU?
      # (Hodnota udávaná v milisekundách: 1 sekunda = 1000 milisekund)
      max-duration: 45000
      # Kolikrát musí hráč selhat CAPTCHU před celkovém selhání verifikace?
      max-tries: 3
      # Znaky (čísla a písmena), které jsou povoleny k zobrazování v CAPTCHE
-      dictionary: '123456789'
+      # It is not recommended to add numbers or letters that might look like one another
+      dictionary: '1235689'
      # Jaké typy fontů by měl Sonar používat pro map CAPTCHU?
-      fonts:
+      font-names:
        - Dialog
        - DialogInput
-        - Serif
        - SansSerif
+        - Monospaced

    # Zkouší pokuď hráč posílá správný "client brand packet" serveru
    client-brand:
@@ -37,7 +37,7 @@ attack-tracker:
 # Beachte: IP adressen werden im Klartext gespeichert. Du bist für die Sicherheit der Datenbank verantwortlich
 database:
  # Typ von Datenbank die Sonar verwenden soll um verifizierte Spielerdaten zu speichern
-  # Mögliche Typen: NONE, MYSQL
+  # Mögliche Typen: NONE, MYSQL, MARIADB
  type: NONE
  # HOST für die Authentifizierung mit der SQL Datenbank
  host: localhost
@@ -75,6 +75,8 @@ verification:
      enabled: true
      # Soll Sonar prüfen, ob der Spieler mit Blöcken kollidiert? (Empfohlen)
      check-collisions: true
+      # Soll Sonar den Spieler dazu bringen, ein CAPTCHA zu lösen, wenn er die Schwerkraftprüfung nicht besteht?
+      captcha-on-fail: false
      # Maximale Anzahl an Ticks, die der Spieler fallen muss, um die Plattform erreichen zu dürfen
      max-movement-ticks: 8
      # Maximale Anzahl an ignorierten Y-Bewegungsänderungen, bevor ein Spieler die Überprüfung nicht besteht
@@ -94,36 +96,40 @@ verification:
      # - DURING_ATTACK: Neue Spieler erhalten nur während eines Angriffs ein CAPTCHA
      # - NEVER: Neue Spieler erhalten nie ein CAPTCHA (Empfohlen)
      timing: NEVER
-      # Soll Sonar die X- und Y-Position des CAPTCHAs zufällig wählen?
-      random-position: true
-      # Wie stark sollen Zeichen verzerrt werden (Faktor für Zufälligkeit)?
-      distortions-factor-x: 50
-      # Wie stark sollen Zeichen verzerrt werden (Faktor für Zufälligkeit)?
-      distortions-factor-y: 50
-      # Wie viele zufällige Linien hinter dem CAPTCHA soll Sonar zeichnen?
-      random-lines: 4
-      # Wie viele zufällige Ovale hinter dem CAPTCHA soll Sonar zeichnen?
-      random-ovals: 1
-      # Soll Sonar die Schriftgröße für das Rendern des CAPTCHAs zufällig wählen?
-      random-font-size: true
+      # Options for the effects on the image shown to the player
+      effects:
+        # Adds a glow effect to the image
+        flare: true
+        # Adds random lines to the image
+        scratches: true
+        # Applies a ripple (sine) distortion filter
+        ripple: true
+        # Applies a horizontal distortion filter
+        smear: true
+        # Adds a bit of blurriness/distortion to the image
+        pinch: true
+        # Applies color correction (color saturation)
+        saturation: 0.15
+        # Applies a horizontal triangular ripple filter
+        distortion: 2
      # Wie viele Antworten soll Sonar vorbereiten?
-      # Dieser Vorgang erfolgt asynchron im Hintergrund;
-      # Spieler können beitreten, sobald ein CAPTCHA vorbereitet wurde
-      precompute: 1000
+      # Dieser Vorgang erfolgt asynchron im Hintergrund
+      precompute: 500
      # Wie lange soll Sonar warten, bis der Spieler das CAPTCHA nicht besteht?
      # (Dieser Wert stellt die Zeit in Millisekunden dar: 1 Sekunde = 1000 Millisekunden)
      max-duration: 45000
      # Wie oft muss ein Spieler das CAPTCHA nicht bestehen, bevor er die Überprüfung nicht besteht?
      max-tries: 3
      # Zeichen (Buchstaben und Zahlen), die im Antwort-CAPTCHA erscheinen dürfen
-      dictionary: '123456789'
+      # It is not recommended to add numbers or letters that might look like one another
+      dictionary: '1235689'
      # Welche Schriftarten soll Sonar für die Map-CAPTCHA-Codes verwenden?
-      fonts:
+      font-names:
        - Dialog
        - DialogInput
-        - Serif
        - SansSerif
-    
+        - Monospaced
+
    # Überprüft, ob die Spieler eine gültige Client-Marke an den Server senden
    client-brand:
      # Soll Sonar auf gültige Client-Marken prüfen? (Empfohlen)
@@ -39,7 +39,7 @@ attack-tracker:
 # Note: IP addresses are saved in plain text. You are responsible for keeping your database safe!
 database:
  # Type of database Sonar uses to store verified players
-  # Possible types: NONE, MYSQL
+  # Possible types: NONE, MYSQL, MARIADB
  type: NONE
  # Host address for authenticating with the SQL database
  host: localhost
@@ -77,6 +77,8 @@ verification:
      enabled: true
      # Should Sonar check if the player collides with blocks? (Recommended)
      check-collisions: true
+      # Should Sonar make the player solve a CAPTCHA if they fail the gravity check?
+      captcha-on-fail: false
      # Maximum number of ticks the player has to fall in order to be allowed to hit the platform
      max-movement-ticks: 8
      # Maximum number of ignored Y movement changes before a player fails verification
@@ -96,34 +98,39 @@ verification:
      # - DURING_ATTACK: New players will only receive a CAPTCHA during an attack
      # - NEVER: New players will never receive a CAPTCHA (Recommended)
      timing: NEVER
-      # Should Sonar randomize the X and Y position of the CAPTCHA?
-      random-position: true
-      # How much should Sonar distort characters (factor for randomization)?
-      distortions-factor-x: 50
-      distortions-factor-y: 50
-      # How many random lines behind the CAPTCHA should Sonar draw?
-      random-lines: 4
-      # How many random ovals behind the CAPTCHA should Sonar draw?
-      random-ovals: 1
-      # Should Sonar randomize the size of the font used for rendering the CAPTCHA?
-      random-font-size: true
+      # Options for the effects on the image shown to the player
+      effects:
+        # Adds a glow effect to the image
+        flare: true
+        # Adds random lines to the image
+        scratches: true
+        # Applies a ripple (sine) distortion filter
+        ripple: true
+        # Applies a horizontal distortion filter
+        smear: true
+        # Adds a bit of blurriness/distortion to the image
+        pinch: true
+        # Applies color correction (color saturation)
+        saturation: 0.15
+        # Applies a horizontal triangular ripple filter
+        distortion: 2
      # How many answers should Sonar prepare?
-      # This task happens asynchronously in the background;
-      # Players are able to join once one CAPTCHA has been prepared
-      precompute: 1000
+      # This task happens asynchronously in the background
+      precompute: 500
      # How long should Sonar wait until the player fails the CAPTCHA?
      # (This value represents the time in milliseconds: 1 second = 1000 milliseconds)
      max-duration: 45000
      # How many times must a player fail the CAPTCHA before failing the verification?
      max-tries: 3
      # Characters (letters and numbers) that are allowed to appear in the answer to the CAPTCHA
-      dictionary: '123456789'
-      # Which font types should Sonar use for the map CAPTCHA codes?
-      fonts:
+      # It is not recommended to add numbers or letters that might look like one another
+      dictionary: '1235689'
+      # Which fonts should Sonar use for the map CAPTCHA codes?
+      font-names:
        - Dialog
        - DialogInput
-        - Serif
        - SansSerif
+        - Monospaced

    # Checks if the players is sending a valid client brand to the server
    client-brand:
@@ -39,7 +39,7 @@ attack-tracker:
 # შენიშვნა: IP მისამართები ინახება უბრალო ტექსტში. თქვენ ხართ პასუხისმგებელი თქვენი მონაცემთა ბაზის უსაფრთხოებაზე!
 database:
  # მონაცემთა ბაზის ტიპები, რომლებიც Sonar-ს შეუძლია გამოიყენოს ვერიფირებული მოთამაშეების შესანახად
-  # შესაძლო ტიპები: NONE, MYSQL
+  # შესაძლო ტიპები: NONE, MYSQL, MARIADB
  type: NONE
  # ჰოსტის მისამართი SQL მონაცემთა ბაზის ავთენტიფიკაციისთვის
  host: localhost
@@ -77,6 +77,8 @@ verification:
      enabled: true
      # უნდა შეამოწმოს თუ არა Sonar-მა, ეტაკება თუ არა მოთამაშე ბლოკებს?
      check-collisions: true
+      # უნდა აიძულოს თუ არა Sonar-მა მოთამაშეს გადაჭრას CAPTCHA, თუ ისინი ვერ შეასრულებენ სიმძიმის შემოწმებას?
+      captcha-on-fail: false
      # ტიკების მაქსიმალური რაოდენობა რომელითაც მოთამაშე უნდა დაეცეს, რათა პლატფორმაზე დაცემა შეეძლოს
      max-movement-ticks: 8
      # იგნორირებული Y მოძრაობის მაქსიმალური რაოდენობა სანამ, მოთამაშე ვერიფიკაციას ვერ გაივლის
@@ -96,34 +98,39 @@ verification:
      # - DURING_ATTACK: ახალი მოთამაშებს მოუწევთ CAPTCHA-ს გაკეთება მხოლოდ შეტევის დროს
      # - NEVER: ახალ მოთამაშეებს არასდროს მოუწევთ CAPTCHA-ს გაკეთება (Recommended)
      timing: NEVER
-      # მოახდინოს თუ არა Sonar-მა CAPTCHA-ს X და Y პოზიციების რანდომიზაცია?
-      random-position: true
-      # რამდენად უნდა დაამახინჯოს Sonar-მა სიმბოლოები (რანდომიზაციის ფაქტორი)?
-      distortions-factor-x: 50
-      distortions-factor-y: 50
-      # რამდენი რანდომული ხაზი უნდა დახატოს Sonar-მა CAPTCHA-ს უკან?
-      random-lines: 4
-      # რამდენი რანდომული ოვალი უნდა დახატოს სონარმა CAPTCHA-ს უკან?
-      random-ovals: 1
-      # დაარანდომაიზოს Sonar-მა თუ არა შერჩევისას შრიფტის ზომა, რომელიც გამოიყენება CAPTCHA-ზე?
-      random-font-size: true
+      # Options for the effects on the image shown to the player
+      effects:
+        # Adds a glow effect to the image
+        flare: true
+        # Adds random lines to the image
+        scratches: true
+        # Applies a ripple (sine) distortion filter
+        ripple: true
+        # Applies a horizontal distortion filter
+        smear: true
+        # Adds a bit of blurriness/distortion to the image
+        pinch: true
+        # Applies color correction (color saturation)
+        saturation: 0.15
+        # Applies a horizontal triangular ripple filter
+        distortion: 2
      # რამდენი პასუხი უნდა მოამზადოს Sonar-მა?
-      # ეს ხდება ასინქრონულად უკანა ფონზე;
-      # მოთამაშეებს შეუძლიათ შესვლა, როდესაც ერთი CAPTCHA მზად არის
-      precompute: 1000
+      # ეს ხდება ასინქრონულად უკანა ფონზე
+      precompute: 500
      # რამდენ ხანს უნდა დაელოდოს Sonar-ი, სანამ მოთამაშე ვერ გააკეთებს წარმატებულად CAPTCHA-ს?
      # (ეს არის ნაჩვენები მილიწამებში: 1 წამი = 1000 მილიწამი)
      max-duration: 45000
      # რამდენჯერ ვერ უდნა გაიაროს CAPTCHA მოთამაშემ სანამ ვერიფიკაციას ვერ გაივლის?
      max-tries: 3
      # სიმბოლოები (ასოები და რიცხვები), რომლებიც დაშვებულია გამოჩნდეს CAPTCHA-ს პასუხში
-      dictionary: '123456789'
-      # რომელი შრიფტის ტიპები უნდა გამოიყენოს Sonar-მა რუკის CAPTCHA კოდებისთვის?
-      fonts:
+      # It is not recommended to add numbers or letters that might look like one another
+      dictionary: '1235689'
+      # Which fonts should Sonar use for the map CAPTCHA codes?
+      font-names:
        - Dialog
        - DialogInput
-        - Serif
        - SansSerif
+        - Monospaced

    #ამოწმებს, აგზავნიან თუ არა მოთამაშეები სერვერზე რეალურ კლიენტის სახელს
    client-brand:
@@ -39,7 +39,7 @@ attack-tracker:
 # Примечание: IP-адреса сохраняются в виде обычного текста. Вы сами отвечаете за сохранность своей базы данных!
 database:
  # Тип базы данных, которую Sonar использует для хранения проверенных игроков.
-  # Возможные типы: NONE, MYSQL
+  # Возможные типы: NONE, MYSQL, MARIADB
  type: NONE
  # Адрес хоста для аутентификации в базе данных SQL
  host: localhost
@@ -77,6 +77,8 @@ verification:
      enabled: true
      # Должен ли Sonar проверять, сталкивается ли игрок с блоками? (Рекомендуется)
      check-collisions: true
+      # Должен ли Sonar заставлять игрока решать CAPTCHA, если он не проходит проверку на гравитацию?
+      captcha-on-fail: false
      # Максимальное количество тиков, на которое должен упасть игрок, чтобы ему было разрешено упасть на платформу
      max-movement-ticks: 8
      # Максимальное количество проигнорированных изменений движения Y, прежде чем игрок не пройдет проверку
@@ -96,34 +98,39 @@ verification:
      # - DURING_ATTACK: Новые игроки будут получать капчу только во время атаки
      # - NEVER: Новые игроки никогда не получат капчу (Рекомендуется)
      timing: NEVER
-      # Должен ли Sonar рандомизировать положение X и Y капчи?
-      random-position: true
-      # Насколько сильно Sonar должен искажать символы (фактор для рандомизации)?
-      distortions-factor-x: 50
-      distortions-factor-y: 50
-      # Сколько случайных линий за капчей должен нарисовать Sonar?
-      random-lines: 4
-      # Сколько случайных овалов за капчей должен нарисовать Sonar?
-      random-ovals: 1
-      # Должен ли Sonar рандомизировать размер шрифта, используемого для отображения капчи?
-      random-font-size: true
+      # Options for the effects on the image shown to the player
+      effects:
+        # Adds a glow effect to the image
+        flare: true
+        # Adds random lines to the image
+        scratches: true
+        # Applies a ripple (sine) distortion filter
+        ripple: true
+        # Applies a horizontal distortion filter
+        smear: true
+        # Adds a bit of blurriness/distortion to the image
+        pinch: true
+        # Applies color correction (color saturation)
+        saturation: 0.15
+        # Applies a horizontal triangular ripple filter
+        distortion: 2
      # Сколько капч должен подготовить Sonar?
      # Эта задача выполняется асинхронно в фоновом режиме
-      # Игроки смогут присоединиться, как только будет подготовлена одна капча
-      precompute: 1000
+      precompute: 500
      # Как долго Sonar должен ждать, пока игрок не пройдет капча?
      # (Это значение представляет время в миллисекундах: 1 секунда = 1000 миллисекунд)
      max-duration: 45000
      # Сколько раз игрок должен завалить капчу, чтобы не пройти проверку?
      max-tries: 3
      # Символы (буквы и цифры), которые разрешено использовать в ответе на капчу
-      dictionary: '123456789'
+      # It is not recommended to add numbers or letters that might look like one another
+      dictionary: '1235689'
      # Какие типы шрифтов следует использовать в Sonar для текста в капче?
-      fonts:
+      font-names:
        - Dialog
        - DialogInput
-        - Serif
        - SansSerif
+        - Monospaced

    # Проверяет, отправляет ли игрок на сервер действительный клиентский бренд.
    client-brand:
@@ -19,7 +19,11 @@ package xyz.jonesdev.sonar.velocity;

 import com.alessiodp.libby.VelocityLibraryManager;
 import lombok.Getter;
+import net.kyori.adventure.audience.Audience;
+import org.bstats.charts.SimplePie;
+import org.bstats.velocity.Metrics;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.SonarPlatform;
 import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
@@ -30,6 +34,9 @@ import xyz.jonesdev.sonar.velocity.command.VelocitySonarCommand;
 import xyz.jonesdev.sonar.velocity.fallback.FallbackInjectionHelper;
 import xyz.jonesdev.sonar.velocity.fallback.FallbackLoginListener;

+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;

@Getter
@@ -43,6 +50,19 @@ public final class SonarVelocity extends SonarBootstrap<SonarVelocityPlugin> {
    INSTANCE = this;
  }

+  /**
+   * Custom wrapper for Velocity audiences
+   */
+  public static final Map<UUID, Audience> AUDIENCES = new ConcurrentHashMap<>();
+
+  @Override
+  public @Nullable Audience audience(final @Nullable UUID uniqueId) {
+    if (uniqueId == null) {
+      return getPlugin().getServer().getConsoleCommandSource();
+    }
+    return AUDIENCES.get(uniqueId);
+  }
+
  /**
   * Create a wrapper for the plugin logger, so we can use it outside
   * the velocity module.
@@ -67,11 +87,18 @@ public final class SonarVelocity extends SonarBootstrap<SonarVelocityPlugin> {
    }
  };

+  private Metrics metrics;
+
  @Override
  public void enable() {
-
    // Initialize bStats.org metrics
-    getPlugin().getMetricsFactory().make(getPlugin(), getPlatform().getMetricsId());
+    metrics = getPlugin().getMetricsFactory().make(getPlugin(), getPlatform().getMetricsId());
+
+    // Add charts for some configuration options
+    metrics.addCustomChart(new SimplePie("verification",
+      () -> getConfig().getVerification().getTiming().getDisplayName()));
+    metrics.addCustomChart(new SimplePie("captcha",
+      () -> getConfig().getVerification().getMap().getTiming().getDisplayName()));

    // Register Sonar command
    getPlugin().getServer().getCommandManager().register("sonar", new VelocitySonarCommand());
@@ -79,6 +106,7 @@ public final class SonarVelocity extends SonarBootstrap<SonarVelocityPlugin> {
    // Register Fallback listener
    getPlugin().getServer().getEventManager().register(getPlugin(), new FallbackLoginListener());

+    // TODO: find a proper way of handling Audiences on Velocity
    // Register audience register listener
    getPlugin().getServer().getEventManager().register(getPlugin(), new AudienceListener());

@@ -100,4 +128,10 @@ public final class SonarVelocity extends SonarBootstrap<SonarVelocityPlugin> {
    // Make sure to inject into the server's connection handler
    FallbackInjectionHelper.inject(getPlugin().getServer());
  }
+
+  @Override
+  public void disable() {
+    // Make sure to properly shutdown bStats metrics
+    metrics.shutdown();
+  }
 }
@@ -22,17 +22,17 @@ import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.DisconnectEvent;
 import com.velocitypowered.api.event.connection.PostLoginEvent;
 import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.Sonar;
+import xyz.jonesdev.sonar.velocity.SonarVelocity;

 public final class AudienceListener {

  @Subscribe(order = PostOrder.LAST)
  public void handle(final @NotNull PostLoginEvent event) {
-    Sonar.AUDIENCES.put(event.getPlayer().getUsername(), event.getPlayer());
+    SonarVelocity.AUDIENCES.put(event.getPlayer().getUniqueId(), event.getPlayer());
  }

  @Subscribe(order = PostOrder.LAST)
  public void handle(final @NotNull DisconnectEvent event) {
-    Sonar.AUDIENCES.remove(event.getPlayer().getUsername());
+    SonarVelocity.AUDIENCES.remove(event.getPlayer().getUniqueId());
  }
 }
@@ -24,7 +24,7 @@ import xyz.jonesdev.sonar.api.command.InvocationSource;

 public final class VelocityInvocationSource extends InvocationSource {
  public VelocityInvocationSource(final @NotNull CommandSource sender) {
-    super(sender instanceof Player ? ((Player) sender).getUsername() : "Console",
+    super(sender instanceof Player ? ((Player) sender).getUniqueId() : null,
      sender,
      sender instanceof Player,
      sender::hasPermission);
@@ -41,6 +41,7 @@ import java.util.UUID;
 import static com.velocitypowered.proxy.network.Connections.*;
 import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_BANDWIDTH;
 import static xyz.jonesdev.sonar.common.fallback.FallbackUserWrapper.customDisconnect;
+import static xyz.jonesdev.sonar.common.fallback.FallbackUserWrapper.deject;
 import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPreparer.*;

 public final class FallbackChannelHandler extends FallbackChannelHandlerAdapter {
@@ -77,6 +78,13 @@ public final class FallbackChannelHandler extends FallbackChannelHandlerAdapter
    }
    // Store the protocol version
    protocolVersion = ProtocolVersion.fromId(handshake.getProtocolVersion().getProtocol());
+    // Connections from unknown protocol versions will be discarded
+    // as this is the safest way of handling unwanted connections
+    if (protocolVersion.isUnknown()) {
+      // Sonar does NOT support snapshots or unknown versions;
+      // I'll try my best to stay up-to-date!
+      throw new CorruptedFrameException("Unknown protocol");
+    }
    // Store the handshake packet
    handshakePacket = handshake;
    // Hook the traffic listener
@@ -108,12 +116,14 @@ public final class FallbackChannelHandler extends FallbackChannelHandlerAdapter
    // Don't continue the verification process if the verification is disabled
    if (!Sonar.get().getFallback().shouldVerifyNewPlayers()) {
      ctx.fireChannelRead(serverLogin);
+      deject(channel.pipeline());
      return;
    }

    // Completely skip Geyser connections
    if (GeyserUtil.isGeyserConnection(channel, socketAddress)) {
      ctx.fireChannelRead(serverLogin);
+      deject(channel.pipeline());
      return;
    }

@@ -143,6 +153,7 @@ public final class FallbackChannelHandler extends FallbackChannelHandlerAdapter
    final UUID offlineUUID = UUID.nameUUIDFromBytes(offlineUUIDString.getBytes(StandardCharsets.UTF_8));
    if (Sonar.get().getVerifiedPlayerController().has(inetAddress, offlineUUID)) {
      ctx.fireChannelRead(serverLogin);
+      deject(channel.pipeline());
      return;
    }

@@ -156,6 +167,7 @@ public final class FallbackChannelHandler extends FallbackChannelHandlerAdapter
    if (Sonar.get().getConfig().getVerification().getWhitelistedProtocols()
      .contains(protocolVersion.getProtocol())) {
      ctx.fireChannelRead(serverLogin);
+      deject(channel.pipeline());
      return;
    }
Author	SHA1	Message	Date
Jones	475bf28ecf	Release 2.0.24 (#244 )	2024-03-24 20:25:30 +01:00
Jones	9c29753084	Recode map CAPTCHA (#243 ) * feat: implement capja for CAPTCHA generation * feat: implement map color palette for 1.7.2-1.20.4	2024-03-24 20:17:18 +01:00
Jones	f0f5196fbe	Don't drop messages that aren't ByteBufs (#242 )	2024-03-22 14:01:32 +01:00
Jones	d98ce28a59	Implement missing packet limits (#241 )	2024-03-22 13:56:55 +01:00
MISHA	e0d5c67cdf	Fix translation error in the Russian language (#240 )	2024-03-16 11:25:43 +01:00
Jones	65e059368c	Release 2.0.23 (#239 )	2024-03-13 16:15:38 +01:00
dependabot[bot]	b7a031da12	Bump io.github.goooler.shadow from 8.1.5 to 8.1.7 (#238 ) Bumps [io.github.goooler.shadow](https://github.com/Goooler/shadow) from 8.1.5 to 8.1.7. - [Release notes](https://github.com/Goooler/shadow/releases) - [Commits](https://github.com/Goooler/shadow/compare/v8.1.5...v8.1.7) --- updated-dependencies: - dependency-name: io.github.goooler.shadow dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-03-11 19:11:17 +01:00
Jones	e15206a382	Implement CAPTCHA-on-fail option (#237 ) * feat: add option to display a CAPTCHA on fail * fix: remove debug message	2024-03-10 13:11:09 +01:00
Jones	5e4af3053e	Fix local database cache duplicating after reload (#236 )	2024-03-07 20:19:42 +01:00
Jones	7bb231ae0d	Release 2.0.22 (#234 )	2024-03-05 18:07:55 +01:00
Jones	a57dfc4e98	Correctly close database connection (#233 )	2024-03-04 17:29:39 +01:00
Jones	618db4804b	Recode bStats metrics implementation (#232 ) * feat: add verification timing and map captcha timing to bstats charts * fix: use correct char ids for bStats * fix: implement shutdown method to correctly stop certain services * style: small codestyle improvements	2024-03-03 18:31:27 +01:00
Jones	613f793dbf	Relocate database drivers to avoid compatibility issues (#231 )	2024-03-03 10:03:48 +01:00
Jones	40964d431c	Release 2.0.21 (#230 )	2024-03-01 22:58:39 +01:00
Jones	b9deff9c0b	Remove unused protocol ids to avoid exploits (#229 )	2024-03-01 22:55:33 +01:00
Jones	e3f27171cf	Fix NullPointerException (#227 )	2024-03-01 22:50:46 +01:00
Jones	d3601e10fe	Remove pipelines if they are not needed anymore (#226 ) * fix: optimize counting of connections and logins * fix: remove Sonar's pipelines if they aren't needed anymore	2024-03-01 19:25:13 +01:00
Jones	258e425ba1	Use correct packet limits for PluginMessagePacket (#225 )	2024-03-01 17:04:24 +01:00
Jones	915e3f593a	Release 2.0.20 (#224 )	2024-03-01 15:31:01 +01:00
Jones	ef525ce718	Only calculate mitigation stats if webhook is enabled (#223 )	2024-03-01 15:14:52 +01:00
Jones	0fbb71a09f	Also check protocols on BungeeCord servers (#222 )	2024-03-01 14:56:36 +01:00
Jones	6ebe44bad3	Drop connections from unknown protocol versions (#221 )	2024-03-01 14:51:43 +01:00
Jones	153d56eeb4	Implement experimental support for MariaDB (#220 ) * feat: add MariaDB as another db type in the config * fix: make sure to disable logging for unnecessary ORM stuff * fix: use pooled connection source to remove unnecessary reflection * feat: support MariaDB (experimental)	2024-02-29 17:56:58 +01:00
Jones	c214d43b3e	Use correct multiple-byte unit for formatting (#219 )	2024-02-25 12:58:02 +01:00
Jones	f3444de4b8	Optimize codecs by removing unused dimensions (#218 )	2024-02-24 23:18:34 +01:00
Jones	a5bf0947b5	Remove duplicate audience listener (#217 )	2024-02-24 14:29:28 +01:00