Fix horse hitbox falses

Author: 483378

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

@@ -22,6 +22,7 @@
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.collisions.datatypes.SimpleCollisionBox;
 import ac.grim.grimac.utils.data.packetentity.PacketEntity;
+import ac.grim.grimac.utils.data.packetentity.PacketEntityHorse;
 import ac.grim.grimac.utils.data.packetentity.dragon.PacketEntityEnderDragonPart;
 import ac.grim.grimac.utils.nmsutil.ReachUtils;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
@@ -234,6 +235,27 @@ private CheckResult checkReach(PacketEntity reachEntity, Vector3d from, boolean
         // if the entity is not exempt and the entity is alive
         if ((!blacklisted.contains(reachEntity.getType()) && reachEntity.isLivingEntity()) || reachEntity.getType() == EntityTypes.END_CRYSTAL) {
             if (minDistance == Double.MAX_VALUE) {
+                // Interacting with a horse (not necessarily mounting it) forcefully sets the
+                // rotation of the player to the horse's rotation on the client in versions 1.13
+                // and lower, so in that case the rotation sent in the following flying packet
+                // is not the one used for interacting with the horse, but we used it for the reach
+                // calculation, which leads to hitbox flags. However, the player's position is
+                // still accurate, so this forced rotation will not cause reach falses, and we
+                // can still check reach on horse interactions.
+                //
+                // This even affects attacks from the same tick as the client only ray traces
+                // at the start of the tick, so an attack can occur first and then the interaction
+                // happens which breaks the rotation. We exempt attacks automatically because the
+                // horseInteractCausedForcedRotation is set as soon as an interact is received
+                // and is only set to false on the next flying/transaction. This function here is
+                // run either directly on attack/interact if packets have previously been cancelled
+                // or on that next flying/transaction so we always know if the rotation was forced.
+                // If there wasn't any interaction with a horse in a tick, attacks can still be
+                // checked normally.
+                if (reachEntity instanceof PacketEntityHorse && player.packetStateData.horseInteractCausedForcedRotation) {
+                    return NONE;
+                }
+
                 cancelBuffer = 1;
                 return new CheckResult(ResultType.HITBOX, "");
             } else if (minDistance > maxReach) {

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

@@ -625,6 +625,15 @@ public void onPacketReceive(PacketReceiveEvent event) {
         // Such as the NoFall check setting the player to not be on the ground
         player.checkManager.onPacketReceive(event);
 
+        // Reset exemption for forced horse rotation when we know a new tick is starting
+        // The second case (transaction) will be quite unlikely since we should receive a rotation
+        // packet because of the large forced rotation difference.
+        if (WrapperPlayClientPlayerFlying.isFlying(event.getPacketType())
+                || event.getPacketType() == PacketType.Play.Client.WINDOW_CONFIRMATION
+        ) {
+            player.packetStateData.horseInteractCausedForcedRotation = false;
+        }
+
         if (player.packetStateData.cancelDuplicatePacket) {
             event.setCancelled(true);
             player.packetStateData.cancelDuplicatePacket = false;
@@ -813,8 +822,6 @@ private void handleFlying(GrimPlayer player, double x, double y, double z, float
         if (!player.packetStateData.lastPacketWasTeleport) {
             player.packetStateData.didSendMovementBeforeTickEnd = true;
         }
-
-        player.packetStateData.horseInteractCausedForcedRotation = false;
     }
 
     private static void placeLilypad(GrimPlayer player, InteractionHand hand) {