Release 2.1.36 (#503)

Bumps net.kyori.indra.git from 3.1.3 to 3.2.0.

---
updated-dependencies:
- dependency-name: net.kyori.indra.git
  dependency-version: 3.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

bukkit/src/main/java/xyz/jonesdev/sonar/bukkit/fallback/BukkitServerVersion.java

@@ -77,7 +77,8 @@ public enum BukkitServerVersion {
   MINECRAFT_1_21_4,
   MINECRAFT_1_21_5,
   MINECRAFT_1_21_6,
-  MINECRAFT_1_21_7;
+  MINECRAFT_1_21_7,
+  MINECRAFT_1_21_8;
 
   static final BukkitServerVersion[] REVERSED_VALUES;
 

common/src/main/java/xyz/jonesdev/sonar/common/fallback/FallbackInboundHandlerAdapter.java

@@ -168,23 +168,14 @@ public abstract class FallbackInboundHandlerAdapter extends ChannelInboundHandle
   protected final void initialLogin(final @NotNull Channel channel,
                                     final @NotNull InetAddress inetAddress,
                                     final @NotNull Runnable loginPacket) throws Exception {
-    Sonar.get0().getFallback().getOnline().compute(inetAddress, (__, count) -> {
-      final int maxOnlinePerIp = Sonar.get0().getConfig().getMaxOnlinePerIp();
-      // Skip the maximum online per IP check if it's disabled in the configuration
-      if (count != null && maxOnlinePerIp > 0) {
-        // Check if the number of online players using the same IP address as
-        // the connecting player is greater than the configured amount
-        if (count >= maxOnlinePerIp) {
-          customDisconnect(channel, tooManyOnlinePerIP, protocolVersion);
-          return count + 1;
-        }
-      }
-
-      // Let the server know about the login packet
-      loginPacket.run();
-      // Increment the number of accounts with the same IP
-      return count == null ? 1 : count + 1;
-    });
+    final int maxOnlinePerIp = Sonar.get0().getConfig().getMaxOnlinePerIp();
+    final int newCount = Sonar.get0().getFallback().getOnline().compute(inetAddress,
+      (__, count) -> count == null ? 1 : count + 1);
+    if (newCount > maxOnlinePerIp) {
+      customDisconnect(channel, tooManyOnlinePerIP, protocolVersion);
+      return;
+    }
+    loginPacket.run();
   }
 
   /**

gradle.properties

@@ -1,3 +1,3 @@
 group=xyz.jonesdev
-version=2.1.35
+version=2.1.36
 description=A lightweight, effective, and easy-to-use anti-bot plugin for Velocity, BungeeCord, and Bukkit.

gradle/libs.versions.toml

@@ -7,9 +7,9 @@ libby = "2.0.0-SNAPSHOT"
 pluginyml = "0.6.0"
 
 [plugins]
-indra-git = "net.kyori.indra.git:3.1.3"
+indra-git = "net.kyori.indra.git:3.2.0"
 shadow = "com.gradleup.shadow:8.3.8"
-spotless = "com.diffplug.spotless:7.0.4"
+spotless = "com.diffplug.spotless:7.2.1"
 pluginyml-bungee = { id = "net.minecrell.plugin-yml.bungee", version.ref = "pluginyml" }
 pluginyml-bukkit = { id = "net.minecrell.plugin-yml.bukkit", version.ref = "pluginyml" }
 
@@ -28,12 +28,12 @@ bstats-bungee = { module = "org.bstats:bstats-bungeecord", version.ref = "bstats
 bstats-bukkit = { module = "org.bstats:bstats-bukkit", version.ref = "bstats" }
 bstats-velocity = { module = "org.bstats:bstats-velocity", version.ref = "bstats" }
 imagefilters = "com.jhlabs:filters:2.0.235-1"
-caffeine = "com.github.ben-manes.caffeine:caffeine:3.2.1"
+caffeine = "com.github.ben-manes.caffeine:caffeine:3.2.2"
 annotations = "org.jetbrains:annotations:26.0.2"
 simpleyaml = "com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4"
 ormlite = "com.j256.ormlite:ormlite-jdbc:6.1"
 lombok = "org.projectlombok:lombok:1.18.38"
 bungeecord = "net.md-5:bungeecord-proxy:1.21-SNAPSHOT"
-velocity = "com.velocitypowered:velocity-proxy:3.4.0-SNAPSHOT"
+velocity = "io.papermc.velocity:velocity-proxy:3.4.0-SNAPSHOT"
 # We have to use 1.8.8 for backwards compatibility
 spigot = "org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT"