Merge branch 'GrimAnticheat:2.0' into 2.0

Author: Anthony01M

build.gradle.kts

@@ -25,12 +25,13 @@ repositories {
     maven("https://repo.opencollab.dev/maven-snapshots/") // Floodgate
     maven("https://repo.opencollab.dev/maven-releases/") // Cumulus (for Floodgate)
     maven("https://repo.codemc.io/repository/maven-releases/") // PacketEvents
+    maven("https://repo.codemc.io/repository/maven-snapshots/")
     mavenCentral()
     // FastUtil, Discord-Webhooks
 }
 
 dependencies {
-    implementation("com.github.retrooper.packetevents:spigot:2.3.0")
+    implementation("com.github.retrooper.packetevents:spigot:2.3.1-SNAPSHOT")
     implementation("co.aikar:acf-paper:0.5.1-SNAPSHOT")
     implementation("club.minnced:discord-webhooks:0.8.0") // Newer versions include kotlin-stdlib, which leads to incompatibility with plugins that use Kotlin
     implementation("it.unimi.dsi:fastutil:8.5.13")

src/main/java/ac/grim/grimac/checks/impl/combat/Reach.java

@@ -131,7 +131,7 @@ private boolean isKnownInvalid(PacketEntity reachEntity) {
         } else {
             SimpleCollisionBox targetBox = reachEntity.getPossibleCollisionBoxes();
             if (reachEntity.getType() == EntityTypes.END_CRYSTAL) {
-                targetBox = new SimpleCollisionBox(reachEntity.desyncClientPos.subtract(1, 0, 1), reachEntity.desyncClientPos.add(1, 2, 1));
+                targetBox = new SimpleCollisionBox(reachEntity.trackedServerPosition.getPos().subtract(1, 0, 1), reachEntity.trackedServerPosition.getPos().add(1, 2, 1));
             }
             return ReachUtils.getMinReachToBox(player, targetBox) > player.compensatedEntities.getSelf().getEntityInteractRange();
         }
@@ -159,7 +159,7 @@ private String checkReach(PacketEntity reachEntity, Vector3d from, boolean isPre
         SimpleCollisionBox targetBox = reachEntity.getPossibleCollisionBoxes();
 
         if (reachEntity.getType() == EntityTypes.END_CRYSTAL) { // Hardcode end crystal box
-            targetBox = new SimpleCollisionBox(reachEntity.desyncClientPos.subtract(1, 0, 1), reachEntity.desyncClientPos.add(1, 2, 1));
+            targetBox = new SimpleCollisionBox(reachEntity.trackedServerPosition.getPos().subtract(1, 0, 1), reachEntity.trackedServerPosition.getPos().add(1, 2, 1));
         }
 
         // 1.7 and 1.8 players get a bit of extra hitbox (this is why you should use 1.8 on cross version servers)

src/main/java/ac/grim/grimac/checks/impl/scaffolding/FarPlace.java

@@ -34,9 +34,7 @@ public void onBlockPlace(final BlockPlace place) {
 
         // getPickRange() determines this?
         // With 1.20.5+ the new attribute determines creative mode reach using a modifier
-        double maxReach = player.gamemode == GameMode.CREATIVE && !player.getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_20_5)
-                ? 6.0
-                : player.compensatedEntities.getSelf().getBlockInteractRange();
+        double maxReach = player.compensatedEntities.getSelf().getBlockInteractRange();
         double threshold = player.getMovementThreshold();
         maxReach += Math.hypot(threshold, threshold);
 

src/main/java/ac/grim/grimac/checks/impl/velocity/ExplosionHandler.java

@@ -9,12 +9,18 @@
 import ac.grim.grimac.utils.data.VelocityData;
 import com.github.retrooper.packetevents.event.PacketSendEvent;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
+import com.github.retrooper.packetevents.protocol.world.states.WrappedBlockState;
+import com.github.retrooper.packetevents.protocol.world.states.defaulttags.BlockTags;
+import com.github.retrooper.packetevents.protocol.world.states.type.StateType;
+import com.github.retrooper.packetevents.protocol.world.states.type.StateTypes;
+import com.github.retrooper.packetevents.protocol.world.states.type.StateValue;
 import com.github.retrooper.packetevents.util.Vector3f;
 import com.github.retrooper.packetevents.util.Vector3i;
 import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerExplosion;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.util.Vector;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Deque;
 import java.util.LinkedList;
@@ -43,12 +49,35 @@ public void onPacketSend(final PacketSendEvent event) {
 
             Vector3f velocity = explosion.getPlayerMotion();
 
-            if (!explosion.getRecords().isEmpty()) {
+            final @Nullable WrapperPlayServerExplosion.BlockInteraction blockInteraction = explosion.getBlockInteraction();
+            final boolean shouldDestroy = blockInteraction != WrapperPlayServerExplosion.BlockInteraction.KEEP_BLOCKS;
+            if (!explosion.getRecords().isEmpty() && shouldDestroy) {
                 player.sendTransaction();
 
                 player.latencyUtils.addRealTimeTask(player.lastTransactionSent.get(), () -> {
-                    for (Vector3i records : explosion.getRecords()) {
-                        player.compensatedWorld.updateBlock(records.x, records.y, records.z, 0);
+                    for (Vector3i record : explosion.getRecords()) {
+                        // Null OR not flip redstone blocks, then set to air
+                        if (blockInteraction != WrapperPlayServerExplosion.BlockInteraction.TRIGGER_BLOCKS) {
+                            player.compensatedWorld.updateBlock(record.x, record.y, record.z, 0);
+                        } else {
+                            // We need to flip redstone blocks, or do special things with other blocks
+                            final WrappedBlockState state = player.compensatedWorld.getWrappedBlockStateAt(record);
+                            final StateType type = state.getType();
+                            if (BlockTags.CANDLES.contains(type) || BlockTags.CANDLE_CAKES.contains(type)) {
+                                state.setLit(false);
+                                continue;
+                            } else if (type == StateTypes.BELL) {
+                                // Does this affect anything? I don't know, I don't see anything that relies on whether a bell is ringing.
+                                continue;
+                            }
+
+                            // Otherwise try and flip/open it.
+                            final Object poweredValue = state.getInternalData().get(StateValue.POWERED);
+                            final boolean canFlip = (poweredValue != null && !(Boolean) poweredValue) || type == StateTypes.LEVER;
+                            if (canFlip) {
+                                player.compensatedWorld.tickOpenable(record.x, record.y, record.z);
+                            }
+                        }
                     }
                 });
             }

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

@@ -54,6 +54,11 @@ public PacketPlayerRespawn() {
     private static final byte KEEP_ALL = 3;
 
     private boolean hasFlag(WrapperPlayServerRespawn respawn, byte flag) {
+        // This packet was added in 1.16
+        // On versions older than 1.16, via keeps all data.
+        if (PacketEvents.getAPI().getServerManager().getVersion().isOlderThan(ServerVersion.V_1_16)) {
+            return true;
+        }
         return (respawn.getKeptData() & flag) != 0;
     }
 
@@ -177,8 +182,8 @@ public void onPacketSend(PacketSendEvent event) {
                     player.compensatedWorld.setDimension(respawn.getDimension(), event.getUser());
                 }
 
-                // TODO this needs to be done for other client versions as well. And there should probably be some attribute holder that we can just call reset() on.
-                if (player.getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_20_5) && !this.hasFlag(respawn, KEEP_ATTRIBUTES)) {
+                // TODO And there should probably be some attribute holder that we can just call reset() on.
+                if (player.getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_16) && !this.hasFlag(respawn, KEEP_ATTRIBUTES)) {
                     // Reset attributes if not kept
                     final PacketEntitySelf self = player.compensatedEntities.getSelf();
                     self.gravityAttribute = 0.08d;

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

@@ -280,7 +280,7 @@ public TeleportAcceptData checkTeleportQueue(double x, double y, double z) {
 
             // There seems to be a version difference in teleports past 30 million... just clamp the vector
             Vector3d clamped = VectorUtils.clampVector(new Vector3d(trueTeleportX, trueTeleportY, trueTeleportZ));
-            double threshold = teleportPos.isRelativeX() ? player.getMovementThreshold() : 0;
+            double threshold = teleportPos.isRelative() ? player.getMovementThreshold() : 0;
             boolean closeEnoughY = Math.abs(clamped.getY() - y) <= 1e-7 + threshold; // 1.7 rounding
 
             if (player.lastTransactionReceived.get() == teleportPos.getTransaction() && Math.abs(clamped.getX() - x) <= threshold && closeEnoughY && Math.abs(clamped.getZ() - z) <= threshold) {

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

@@ -17,6 +17,7 @@
 import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
 import ac.grim.grimac.utils.collisions.datatypes.SimpleCollisionBox;
 import ac.grim.grimac.utils.data.VectorData;
+import ac.grim.grimac.utils.data.packetentity.PacketEntity;
 import ac.grim.grimac.utils.data.packetentity.PacketEntityHorse;
 import ac.grim.grimac.utils.data.packetentity.PacketEntityRideable;
 import ac.grim.grimac.utils.data.packetentity.PacketEntityTrackXRot;
@@ -55,19 +56,14 @@ public void processAndCheckMovementPacket(PositionUpdate data) {
         // This teleport wasn't valid as the player STILL hasn't loaded this damn chunk.
         // Keep re-teleporting until they load the chunk!
         if (player.getSetbackTeleportUtil().insideUnloadedChunk()) {
-            player.lastOnGround = player.clientClaimsLastOnGround; // Stop a false on join
-
             // The player doesn't control this vehicle, we don't care
-            if (player.compensatedEntities.getSelf().inVehicle() &&
+            final boolean invalidVehicle = player.compensatedEntities.getSelf().inVehicle() &&
                     (PacketEvents.getAPI().getServerManager().getVersion().isOlderThan(ServerVersion.V_1_9) ||
-                    player.getClientVersion().isOlderThan(ClientVersion.V_1_9))) {
-                return;
-            }
+                            player.getClientVersion().isOlderThan(ClientVersion.V_1_9));
 
-            if (!data.isTeleport()) {
+            if (!invalidVehicle && !data.isTeleport()) {
                 // Teleport the player back to avoid players being able to simply ignore transactions
                 player.getSetbackTeleportUtil().executeForceResync();
-                return;
             }
         }
 
@@ -180,19 +176,20 @@ private void check(PositionUpdate update) {
             player.clientVelocity.multiply(0.98); // This is vanilla, do not touch
         }
 
+        final PacketEntity riding = player.compensatedEntities.getSelf().getRiding();
         if (player.vehicleData.wasVehicleSwitch || player.vehicleData.lastDummy) {
             update.setTeleport(true);
 
             player.vehicleData.lastDummy = false;
             player.vehicleData.wasVehicleSwitch = false;
 
-            if (player.compensatedEntities.getSelf().getRiding() != null) {
+            if (riding != null) {
                 Vector pos = new Vector(player.x, player.y, player.z);
-                SimpleCollisionBox interTruePositions = player.compensatedEntities.getSelf().getRiding().getPossibleCollisionBoxes();
+                SimpleCollisionBox interTruePositions = riding.getPossibleCollisionBoxes();
 
                 // We shrink the expanded bounding box to what the packet positions can be, for a smaller box
-                float width = BoundingBoxSize.getWidth(player, player.compensatedEntities.getSelf().getRiding());
-                float height = BoundingBoxSize.getHeight(player, player.compensatedEntities.getSelf().getRiding());
+                float width = BoundingBoxSize.getWidth(player, riding) * riding.scale;
+                float height = BoundingBoxSize.getHeight(player, riding) * riding.scale;
                 interTruePositions.expand(-width, 0, -width);
                 interTruePositions.expandMax(0, -height, 0);
 
@@ -258,25 +255,25 @@ private void check(PositionUpdate update) {
             player.checkManager.getExplosionHandler().forceExempt();
 
             // When in control of the entity, the player sets the entity position to their current position
-            player.compensatedEntities.getSelf().getRiding().setPositionRaw(GetBoundingBox.getPacketEntityBoundingBox(player, player.x, player.y, player.z, player.compensatedEntities.getSelf().getRiding()));
+            riding.setPositionRaw(GetBoundingBox.getPacketEntityBoundingBox(player, player.x, player.y, player.z, riding));
 
-            if (player.compensatedEntities.getSelf().getRiding() instanceof PacketEntityTrackXRot) {
-                PacketEntityTrackXRot boat = (PacketEntityTrackXRot) player.compensatedEntities.getSelf().getRiding();
+            if (riding instanceof PacketEntityTrackXRot) {
+                PacketEntityTrackXRot boat = (PacketEntityTrackXRot) riding;
                 boat.packetYaw = player.xRot;
                 boat.interpYaw = player.xRot;
                 boat.steps = 0;
             }
 
-            if (player.hasGravity != player.compensatedEntities.getSelf().getRiding().hasGravity) {
+            if (player.hasGravity != riding.hasGravity) {
                 player.pointThreeEstimator.updatePlayerGravity();
             }
-            player.hasGravity = player.compensatedEntities.getSelf().getRiding().hasGravity;
+            player.hasGravity = riding.hasGravity;
 
             // For whatever reason the vehicle move packet occurs AFTER the player changes slots...
-            if (player.compensatedEntities.getSelf().getRiding() instanceof PacketEntityRideable) {
+            if (riding instanceof PacketEntityRideable) {
                 EntityControl control = player.checkManager.getPostPredictionCheck(EntityControl.class);
 
-                ItemType requiredItem = player.compensatedEntities.getSelf().getRiding().getType() == EntityTypes.PIG ? ItemTypes.CARROT_ON_A_STICK : ItemTypes.WARPED_FUNGUS_ON_A_STICK;
+                ItemType requiredItem = riding.getType() == EntityTypes.PIG ? ItemTypes.CARROT_ON_A_STICK : ItemTypes.WARPED_FUNGUS_ON_A_STICK;
                 ItemStack mainHand = player.getInventory().getHeldItem();
                 ItemStack offHand = player.getInventory().getOffHand();
 
@@ -323,7 +320,7 @@ private void check(PositionUpdate update) {
             player.isSprinting = false;
             player.isSneaking = false;
 
-            if (player.compensatedEntities.getSelf().getRiding().getType() != EntityTypes.PIG && player.compensatedEntities.getSelf().getRiding().getType() != EntityTypes.STRIDER) {
+            if (riding.getType() != EntityTypes.PIG && riding.getType() != EntityTypes.STRIDER) {
                 player.isClimbing = false;
             }
         }
@@ -427,7 +424,7 @@ private void check(PositionUpdate update) {
         boolean wasChecked = false;
 
         // Exempt if the player is dead or is riding a dead entity
-        if (player.compensatedEntities.getSelf().isDead || (player.compensatedEntities.getSelf().getRiding() != null && player.compensatedEntities.getSelf().getRiding().isDead)) {
+        if (player.compensatedEntities.getSelf().isDead || (riding != null && riding.isDead)) {
             // Dead players can't cheat, if you find a way how they could, open an issue
             player.predictedVelocity = new VectorData(new Vector(), VectorData.VectorType.Dead);
             player.clientVelocity = new Vector();
@@ -441,7 +438,7 @@ private void check(PositionUpdate update) {
             player.gravity = 0;
             player.friction = 0.91f;
             PredictionEngineNormal.staticVectorEndOfTick(player, player.clientVelocity);
-        } else if (player.compensatedEntities.getSelf().getRiding() == null) {
+        } else if (riding == null) {
             wasChecked = true;
 
             // Depth strider was added in 1.8
@@ -495,17 +492,17 @@ private void check(PositionUpdate update) {
             // The player and server are both on a version with client controlled entities
             // If either or both of the client server version has server controlled entities
             // The player can't use entities (or the server just checks the entities)
-            if (EntityTypes.isTypeInstanceOf(player.compensatedEntities.getSelf().getRiding().getType(), EntityTypes.BOAT)) {
+            if (EntityTypes.isTypeInstanceOf(riding.getType(), EntityTypes.BOAT)) {
                 new PlayerBaseTick(player).doBaseTick();
                 // Speed doesn't affect anything with boat movement
                 new BoatPredictionEngine(player).guessBestMovement(0.1f, player);
-            } else if (player.compensatedEntities.getSelf().getRiding() instanceof PacketEntityHorse) {
+            } else if (riding instanceof PacketEntityHorse) {
                 new PlayerBaseTick(player).doBaseTick();
                 new MovementTickerHorse(player).livingEntityAIStep();
-            } else if (player.compensatedEntities.getSelf().getRiding().getType() == EntityTypes.PIG) {
+            } else if (riding.getType() == EntityTypes.PIG) {
                 new PlayerBaseTick(player).doBaseTick();
                 new MovementTickerPig(player).livingEntityAIStep();
-            } else if (player.compensatedEntities.getSelf().getRiding().getType() == EntityTypes.STRIDER) {
+            } else if (riding.getType() == EntityTypes.STRIDER) {
                 new PlayerBaseTick(player).doBaseTick();
                 new MovementTickerStrider(player).livingEntityAIStep();
                 MovementTickerStrider.floatStrider(player);

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

@@ -138,8 +138,8 @@ public void tickFireworksBox() {
             if (entity == null) continue;
 
             SimpleCollisionBox entityBox = entity.getPossibleCollisionBoxes();
-            float width = BoundingBoxSize.getWidth(player, entity);
-            float height = BoundingBoxSize.getHeight(player, entity);
+            float width = BoundingBoxSize.getWidth(player, entity) * entity.scale;
+            float height = BoundingBoxSize.getHeight(player, entity) * entity.scale;
 
             // Convert back to coordinates instead of hitbox
             entityBox.maxY -= height;

src/main/java/ac/grim/grimac/utils/anticheat/update/BlockPlace.java

@@ -574,16 +574,16 @@ public void set(Vector3i position, WrappedBlockState state) {
                 for (PacketEntity entity : player.compensatedEntities.entityMap.values()) {
                     SimpleCollisionBox interpBox = entity.getPossibleCollisionBoxes();
 
-                    double width = BoundingBoxSize.getWidth(player, entity);
-                    double height = BoundingBoxSize.getHeight(player, entity);
+                    double width = BoundingBoxSize.getWidth(player, entity) * entity.scale;
+                    double height = BoundingBoxSize.getHeight(player, entity) * entity.scale;
                     double interpWidth = Math.max(interpBox.maxX - interpBox.minX, interpBox.maxZ - interpBox.minZ);
                     double interpHeight = interpBox.maxY - interpBox.minY;
 
                     // If not accurate, fall back to desync pos
                     // This happens due to the lack of an idle packet on 1.9+ clients
                     // On 1.8 clients this should practically never happen
                     if (interpWidth - width > 0.05 || interpHeight - height > 0.05) {
-                        Vector3d entityPos = entity.desyncClientPos;
+                        Vector3d entityPos = entity.trackedServerPosition.getPos();
                         interpBox = GetBoundingBox.getPacketEntityBoundingBox(player, entityPos.getX(), entityPos.getY(), entityPos.getZ(), entity);
                     }
 

src/main/java/ac/grim/grimac/utils/collisions/blocks/connecting/DynamicWall.java

@@ -14,7 +14,6 @@
 import com.github.retrooper.packetevents.protocol.world.states.enums.South;
 import com.github.retrooper.packetevents.protocol.world.states.enums.West;
 import com.github.retrooper.packetevents.protocol.world.states.type.StateType;
-import com.github.retrooper.packetevents.protocol.world.states.type.StateTypes;
 
 public class DynamicWall extends DynamicConnecting implements CollisionFactory {
     public static final CollisionBox[] BOXES = makeShapes(4.0F, 3.0F, 16.0F, 0.0F, 16.0F, false);