More setback changes

Author: SamB440

common/src/main/java/ac/grim/grimac/events/packets/PacketPlayerRespawn.java

@@ -212,7 +212,7 @@ public void onPacketSend(PacketSendEvent event) {
                 player.clientVelocity = new Vector3dm();
                 if (!GrimAPI.INSTANCE.getSpectateManager().isSpectating(player.uuid)) {
                     player.gamemode = respawn.getGameMode();
-                }  
+                }
                 if (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_17)) {
                     player.compensatedWorld.setDimension(respawn.getDimensionType(), event.getUser());
                 }

common/src/main/java/ac/grim/grimac/manager/SetbackTeleportUtil.java

@@ -40,6 +40,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -217,7 +218,7 @@ private void blockMovementsUntilResync(boolean simulateNextTickPosition, boolean
             blockOffsets = true;
         }
 
-        SetBackData data = new SetBackData(new TeleportData(position, new Vector3d(), RelativeFlag.YAW.or(RelativeFlag.PITCH), player.lastTransactionSent.get(), 0), player.yaw, player.pitch, clientVel, player.inVehicle(), false);
+        SetBackData data = new SetBackData(new TeleportData(position, null, RelativeFlag.YAW.or(RelativeFlag.PITCH), player.lastTransactionSent.get(), 0), player.yaw, player.pitch, clientVel, player.inVehicle(), false);
         sendSetback(data);
     }
 
@@ -269,7 +270,8 @@ private void sendSetback(SetBackData data) {
             data.getTeleportData().setTransaction(player.lastTransactionSent.get());
 
             // Use provided transaction ID to make sure it can never desync, although there's no reason to do this
-            addSentTeleport(new Location(null, position.getX(), y, position.getZ(), player.yaw % 360, player.pitch % 360), new Vector3d(), data.getTeleportData().getTransaction(), new RelativeFlag(0b11000), false, teleportId);
+            addSentTeleport(new Location(null, position.getX(), y, position.getZ(), player.yaw % 360, player.pitch % 360),
+                    null, data.getTeleportData().getTransaction(), RelativeFlag.YAW.or(RelativeFlag.PITCH), false, teleportId);
             // This must be done after setting the sent teleport, otherwise we lose velocity data
             requiredSetBack = data;
             // Send after tracking to fix race condition
@@ -405,7 +407,12 @@ public boolean insideUnloadedChunk() {
                 !player.getSetbackTeleportUtil().hasAcceptedSpawnTeleport);
     }
 
-    public void addSentTeleport(Location position, Vector3d velocity, int transaction, RelativeFlag flags, boolean plugin, int teleportId) {
+    public void addSentTeleport(Location position, @Nullable Vector3d velocity, int transaction, RelativeFlag flags, boolean plugin, int teleportId) {
+        // Clients below 1.21.2 do not have this.
+        if (player.getClientVersion().isOlderThan(ClientVersion.V_1_21_2)) {
+            velocity = null;
+        }
+
         TeleportData data = new TeleportData(new Vector3d(position.getX(), position.getY(), position.getZ()), velocity, flags, transaction, teleportId);
         pendingTeleports.add(data);
 
@@ -424,7 +431,7 @@ public void addSentTeleport(Location position, Vector3d velocity, int transactio
             safePosition = safePosition.withZ(safePosition.getZ() + lastKnownGoodPosition.pos.getZ());
         }
 
-        data = new TeleportData(safePosition, velocity, new RelativeFlag(0b11000), transaction, teleportId);
+        data = new TeleportData(safePosition, velocity, RelativeFlag.YAW.or(RelativeFlag.PITCH), transaction, teleportId);
         requiredSetBack = new SetBackData(data, player.yaw, player.pitch, null, false, plugin);
 
         this.lastKnownGoodPosition = new SetbackPosWithVector(safePosition, new Vector3dm());

common/src/main/java/ac/grim/grimac/predictionengine/MovementCheckRunner.java

@@ -18,6 +18,7 @@
 import ac.grim.grimac.utils.anticheat.update.PositionUpdate;
 import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
 import ac.grim.grimac.utils.collisions.datatypes.SimpleCollisionBox;
+import ac.grim.grimac.utils.data.SetBackData;
 import ac.grim.grimac.utils.data.VectorData;
 import ac.grim.grimac.utils.data.packetentity.PacketEntity;
 import ac.grim.grimac.utils.data.packetentity.PacketEntityCamel;
@@ -107,7 +108,15 @@ private void handleTeleport(PositionUpdate update) {
                 player.lastWasClimbing = 0; // Vertical movement reset
                 player.canSwimHop = false; // Vertical movement reset
             } else {
-                update.getTeleportData().modifyVector(player, player.clientVelocity);
+                final SetBackData setback = update.getSetback();
+                if (setback == null || setback.getVelocity() == null) {
+                    update.getTeleportData().modifyVector(player, player.clientVelocity);
+                } else {
+                    // Enforce setback velocity?
+                    player.clientVelocity.setX(setback.getVelocity().getX());
+                    player.clientVelocity.setY(setback.getVelocity().getY());
+                    player.clientVelocity.setZ(setback.getVelocity().getZ());
+                }
             }
         }
 
@@ -599,7 +608,10 @@ private void check(PositionUpdate update) {
             player.riptideSpinAttackTicks = 20;
 
         player.uncertaintyHandler.lastMovementWasZeroPointZeroThree = !player.inVehicle() && player.skippedTickInActualMovement;
-        player.uncertaintyHandler.lastMovementWasUnknown003VectorReset = !player.inVehicle() && player.couldSkipTick && player.predictedVelocity.isKnockback();
+        player.uncertaintyHandler.lastMovementWasUnknown003VectorReset = !player.inVehicle() && player.couldSkipTick
+                && player.predictedVelocity.isKnockback()
+                // Don't let setbacks count
+                && !player.predictedVelocity.isSetbackKb(player);
         player.couldSkipTick = false;
 
         // Logic is if the player was directly 0.03 and the player could control vertical movement in 0.03

common/src/main/java/ac/grim/grimac/predictionengine/UncertaintyHandler.java

@@ -211,7 +211,7 @@ public void tickFireworksBox() {
     public double getOffsetHorizontal(VectorData data) {
         double threshold = player.getMovementThreshold();
 
-        boolean newVectorPointThree = player.couldSkipTick && data.isKnockback();
+        boolean newVectorPointThree = player.couldSkipTick && data.isKnockback() && !data.isSetbackKb(player);
         boolean explicit003 = data.isZeroPointZeroThree() || lastMovementWasZeroPointZeroThree;
         boolean either003 = newVectorPointThree || explicit003;
 

common/src/main/java/ac/grim/grimac/utils/data/TeleportData.java

@@ -8,11 +8,13 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 @AllArgsConstructor
 @Getter
 public class TeleportData {
     private final Vector3d location;
+    @Nullable
     private final Vector3d velocity;
     private final RelativeFlag flags;
     @Setter

common/src/main/java/ac/grim/grimac/utils/data/VectorData.java

@@ -1,5 +1,6 @@
 package ac.grim.grimac.utils.data;
 
+import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.math.Vector3dm;
 import lombok.Getter;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
@@ -55,6 +56,14 @@ public VectorData returnNewModified(Vector3dm newVec, VectorType type) {
         return new VectorData(newVec, this, type);
     }
 
+    public boolean isSetbackKb(GrimPlayer player) {
+        if (!isKnockback) {
+            return false;
+        }
+
+        return (firstBreadKb ? player.firstBreadKB : player.likelyKB).isSetback;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;