Release 2.0.30 (#295)

gradle.properties

@@ -1,3 +1,3 @@
 group=xyz.jonesdev.sonar
-version=2.0.29
+version=2.0.30
 description=Effective Anti-bot plugin for Velocity, BungeeCord, and Bukkit (1.7-latest)

sonar-common/build.gradle.kts

@@ -5,7 +5,7 @@ dependencies {
   compileOnly("net.kyori:adventure-nbt:4.16.0")
 
   // CAPTCHA image generation
-  implementation("xyz.jonesdev:capja:1.0.2")
+  implementation("xyz.jonesdev:capja:1.0.3")
 }
 
 java.sourceCompatibility = JavaVersion.VERSION_11

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/captcha/CaptchaPreparer.java

@@ -65,36 +65,34 @@ public final class CaptchaPreparer {
       final SimpleCaptchaGenerator generator = new SimpleCaptchaGenerator(128, 128, backgroundImage);
       final char[] dictionary = config.getDictionary().toCharArray();
 
-      final SimpleScratchFilter scratchFilter = new SimpleScratchFilter(5);
-      final BumpFilter bumpFilter = new BumpFilter();
+      // Prepare the filters for the CAPTCHA
+      final List<AbstractBufferedImageOp> filters = new ArrayList<>();
+      if (Sonar.get().getConfig().getVerification().getMap().isScratches()) {
+        filters.add(new SimpleScratchFilter(5));
+      }
+      if (Sonar.get().getConfig().getVerification().getMap().isRipple()) {
+        final SimpleRippleFilter rippleFilter = new SimpleRippleFilter();
+        rippleFilter.setXAmplitude(0);
+        float yAmplitude = 10 - ThreadLocalRandom.current().nextInt(20);
+        if (Math.abs(yAmplitude) < 3) {
+          yAmplitude = yAmplitude >= 0 ? 3 : -3;
+        }
+        rippleFilter.setYAmplitude(yAmplitude);
+        filters.add(rippleFilter);
+      }
+      if (Sonar.get().getConfig().getVerification().getMap().getDistortion().isEnabled()) {
+        final SmearFilter smearFilter = new SmearFilter();
+        smearFilter.setShape(Sonar.get().getConfig().getVerification().getMap().getDistortion().getShape());
+        smearFilter.setMix(Sonar.get().getConfig().getVerification().getMap().getDistortion().getMix());
+        smearFilter.setDensity(Sonar.get().getConfig().getVerification().getMap().getDistortion().getDensity());
+        smearFilter.setDistance(Sonar.get().getConfig().getVerification().getMap().getDistortion().getDistance());
+        filters.add(smearFilter);
+      }
+      if (Sonar.get().getConfig().getVerification().getMap().isBump()) {
+        filters.add(new BumpFilter());
+      }
 
       for (preparedAmount = 0; preparedAmount < config.getPrecomputeAmount(); preparedAmount++) {
-        // Prepare the filters per CAPTCHA for some more randomness
-        final List<AbstractBufferedImageOp> filters = new ArrayList<>();
-        if (Sonar.get().getConfig().getVerification().getMap().isScratches()) {
-          filters.add(scratchFilter);
-        }
-        if (Sonar.get().getConfig().getVerification().getMap().isRipple()) {
-          final SimpleRippleFilter rippleFilter = new SimpleRippleFilter();
-          rippleFilter.setXAmplitude(0);
-          float yAmplitude = 10 - ThreadLocalRandom.current().nextInt(20);
-          if (Math.abs(yAmplitude) < 3) {
-            yAmplitude = yAmplitude >= 0 ? 3 : -3;
-          }
-          rippleFilter.setYAmplitude(yAmplitude);
-          filters.add(rippleFilter);
-        }
-        if (Sonar.get().getConfig().getVerification().getMap().getDistortion().isEnabled()) {
-          final SmearFilter smearFilter = new SmearFilter();
-          smearFilter.setShape(Sonar.get().getConfig().getVerification().getMap().getDistortion().getShape());
-          smearFilter.setMix(Sonar.get().getConfig().getVerification().getMap().getDistortion().getMix());
-          smearFilter.setDensity(Sonar.get().getConfig().getVerification().getMap().getDistortion().getDensity());
-          smearFilter.setDistance(Sonar.get().getConfig().getVerification().getMap().getDistortion().getDistance());
-          filters.add(smearFilter);
-        }
-        if (Sonar.get().getConfig().getVerification().getMap().isBump()) {
-          filters.add(bumpFilter);
-        }
         if (!Sonar.get().getConfig().getVerification().getMap().isAutoColor()) {
           // Generate a random gradient color if automatic coloring is disabled
           final Color color0 = Color.getHSBColor((float) Math.random(), 1, 1);

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/captcha/MapCaptchaInfo.java

@@ -21,7 +21,6 @@ import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.fallback.FallbackUser;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
-import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketSnapshot;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.play.MapDataPacket;
 
 import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.MINECRAFT_1_8;
@@ -44,21 +43,22 @@ public final class MapCaptchaInfo {
     }
     this.legacy = new FallbackPacket[grid.length];
     for (int i = 0; i < grid.length; i++) {
-      this.legacy[i] = new FallbackPacketSnapshot(new MapDataPacket(grid[i], i, 0));
+      this.legacy[i] = new MapDataPacket(grid[i], i, 0);
     }
 
     // Prepare 1.8+ map data
-    this.modern = new FallbackPacketSnapshot(new MapDataPacket(buffer, 0, 0));
+    this.modern = new MapDataPacket(buffer, 0, 0);
   }
 
   public void delayedWrite(final @NotNull FallbackUser user) {
-    if (user.getProtocolVersion().compareTo(MINECRAFT_1_8) >= 0) {
-      user.delayedWrite(modern);
-    } else {
-      // 1.7.2-1.7.10
+    if (user.getProtocolVersion().compareTo(MINECRAFT_1_8) < 0) {
+      // 1.7.2-1.7.10 needs separate packets for each axis
       for (final FallbackPacket legacyPacket : legacy) {
         user.delayedWrite(legacyPacket);
       }
+      return;
     }
+    // Send modern packet
+    user.delayedWrite(modern);
   }
 }