Merge remote-tracking branch 'up/update/1.21.5' into update/1.21.5

Author: kennytv

paper-server/patches/sources/net/minecraft/server/level/ServerPlayer.java.patch

@@ -1360,7 +1360,7 @@
 +        // Paper end - Force entity dismount during teleportation
          Entity vehicle = this.getVehicle();
 -        super.removeVehicle();
-+        super.stopRiding(suppressCancellation); // Paper - Force entity dismount during teleportation
++        super.removeVehicle(suppressCancellation); // Paper - Force entity dismount during teleportation
          if (vehicle instanceof LivingEntity livingEntity) {
              for (MobEffectInstance mobEffectInstance : livingEntity.getActiveEffects()) {
                  this.connection.send(new ClientboundRemoveMobEffectPacket(vehicle.getId(), mobEffectInstance.getEffect()));

paper-server/patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch

@@ -835,7 +835,7 @@
                                  d3 = d - this.player.getX();
                                  d4 = d1 - this.player.getY();
                                  if (d4 > -0.5 || d4 < 0.5) {
-@@ -1050,23 +_,103 @@
+@@ -1050,23 +_,104 @@
 
                                  d5 = d2 - this.player.getZ();
                                  d7 = d3 * d3 + d4 * d4 + d5 * d5;
@@ -862,7 +862,6 @@
 -                                    || this.player.isSleeping()
 -                                    || (!flag2 || !serverLevel.noCollision(this.player, boundingBox))
 -                                        && !this.isPlayerCollidingWithAnythingNew(serverLevel, boundingBox, d, d1, d2)) {
--                                    this.player.absSnapTo(d, d1, d2, f, f1);
 +                                    } // Paper
 +                                }
 +
@@ -944,6 +943,7 @@
 +                                        }
 +                                    }
 +                                    // CraftBukkit end
+                                     this.player.absSnapTo(d, d1, d2, f, f1);
                                      boolean isAutoSpinAttack = this.player.isAutoSpinAttack();
 -                                    this.clientIsFloating = d4 >= -0.03125
 +                                    this.clientIsFloating = verticalDelta >= -0.03125 // Paper - Decompile fix