Mark BadPacketsZ as no longer experimental

Merge pull request #1814 from Axionize/dynamically-configurable-relocate
Make relocate read from project properties --> environment variable --> default to true
2024-11-23 23:59:56 -05:00 · 2024-11-23 19:11:32 +00:00 · 2024-11-23 10:57:15 +00:00 · 2024-11-23 10:56:35 +00:00 · 2024-11-22 21:23:12 -05:00 · 2024-11-22 14:33:57 -07:00
6 changed files with 9 additions and 6 deletions
@@ -35,7 +35,10 @@ java {

 // Set to false for debug builds
 // You cannot live reload classes if the jar relocates dependencies
-var relocate = true;
+// Checks Project properties -> environment variable -> defaults true
+val relocate: Boolean = project.findProperty("relocate")?.toString()?.toBoolean()
+    ?: System.getenv("RELOCATE_JAR")?.toBoolean()
+    ?: true

 repositories {
    mavenLocal()
@@ -16,7 +16,7 @@ import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPl
 import static ac.grim.grimac.events.packets.patch.ResyncWorldUtil.resyncPosition;
 import static ac.grim.grimac.utils.nmsutil.BlockBreakSpeed.getBlockDamage;

-@CheckData(name = "BadPacketsZ", experimental = true)
+@CheckData(name = "BadPacketsZ")
 public class BadPacketsZ extends Check implements PacketCheck {
    public BadPacketsZ(final GrimPlayer player) {
        super(player);
@@ -59,7 +59,7 @@ public class MultiInteractA extends Check implements PostPredictionCheck {
        // we don't need to check pre-1.9 players here (no tick skipping)
        if (player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8)) return;

-        if (player.isTickingReliablyFor(3)) {
+        if (player.isTickingReliablyFor(3) && !player.uncertaintyHandler.lastVehicleSwitch.hasOccurredSince(0)) {
            for (String verbose : flags) {
                flagAndAlert(verbose);
            }
@@ -60,7 +60,7 @@ public class MultiInteractB extends Check implements PostPredictionCheck {
        // we don't need to check pre-1.9 players here (no tick skipping)
        if (player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8)) return;

-        if (player.isTickingReliablyFor(3)) {
+        if (player.isTickingReliablyFor(3) && !player.uncertaintyHandler.lastVehicleSwitch.hasOccurredSince(0)) {
            for (String verbose : flags) {
                flagAndAlert(verbose);
            }
@@ -43,7 +43,7 @@ public class PostCheck extends Check implements PacketCheck, PostPredictionCheck
            // Okay, the user might be cheating, let's double check
            // 1.8 clients have the idle packet, and this shouldn't false on 1.8 clients
            // 1.9+ clients have predictions, which will determine if hidden tick skipping occurred
-            if (player.isTickingReliablyFor(3)) {
+            if (player.isTickingReliablyFor(3) && !player.uncertaintyHandler.lastVehicleSwitch.hasOccurredSince(0)) {
                for (String flag : flags) {
                    flagAndAlert(flag);
                }
@@ -63,7 +63,7 @@ public class MultiPlace extends BlockPlaceCheck {

    @Override
    public void onPredictionComplete(PredictionComplete predictionComplete) {
-        if (player.getClientVersion().isNewerThan(ClientVersion.V_1_8) && player.isTickingReliablyFor(3)) {
+        if (player.getClientVersion().isNewerThan(ClientVersion.V_1_8) && player.isTickingReliablyFor(3) && !player.uncertaintyHandler.lastVehicleSwitch.hasOccurredSince(0)) {
            for (String verbose : flags) {
                flagAndAlert(verbose);
            }
Author	SHA1	Message	Date
Axionize	8af0dbc46d	Mark BadPacketsZ as no longer experimental	2024-11-23 23:59:56 -05:00
SamB440	5f7d296b4d	Merge pull request #1814 from Axionize/dynamically-configurable-relocate Make relocate read from project properties --> environment variable --> default to true	2024-11-23 19:11:32 +00:00
Axionize	c4cd8136bf	Ensure ComplexCollisionBoxes can only contain SimpleCollisionBoxes (#1805 ) * Ensure ComplexCollisionBoxes can only contain SimpleCollisionBoxes * Optimize ComplexCollisionBoxes by using primitives internally; Make new more efficient constructors available * Port everything to new internal .downCast() API besides getCollisionBoxes * implement new downCast() API for Dynamic, Simple, and No Collision Boxes * Manually size ComplexCollisionBoxes Pt. 1 * Manually size ComplexCollisionBoxes Pt. 2 * Fix new downCast() for SimpleCollisionBox * Fix logic error in CCB constructor * Optimize DynamicHitboxFence * Fix logic error again in CCB constructor * Remove debug print statement * Fix copying CCBs in edge case * Rename variable for clarity * Make CCD length private var * Make makeShapes() CCD extra maxIndex explicit; Fix DynamicCollisionWall error * Remove unused calls to makeShapes()	2024-11-23 10:57:15 +00:00
SamB440	dbc0c11795	Merge pull request #1813 from ManInMyVan/fix/falses fix falses	2024-11-23 10:56:35 +00:00
Axionize	d30b024bd3	Make whether or not to relocate deps read from project properties -> environment variable" Prevents having to modify build.gradle.kts when disabling relocating.	2024-11-22 21:23:12 -05:00
ManInMyVan	a3e979abc8	fix falses	2024-11-22 14:33:57 -07:00