[ci skip] Add more identifying patch comments, merge related patches

patches/server/Prevent-excessive-velocity-through-repeated-crits.patch

@@ -12,10 +12,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          return this.hasEffect(MobEffects.JUMP) ? 0.1F * ((float) this.getEffect(MobEffects.JUMP).getAmplifier() + 1.0F) : 0.0F;
      }
  
-+    protected long lastJumpTime = 0L; // Paper
++    protected long lastJumpTime = 0L; // Paper - Prevent excessive velocity through repeated crits
      protected void jumpFromGround() {
          Vec3 vec3d = this.getDeltaMovement();
-+        // Paper start
++        // Paper start - Prevent excessive velocity through repeated crits
 +        long time = System.nanoTime();
 +        boolean canCrit = true;
 +        if (this instanceof net.minecraft.world.entity.player.Player) {
@@ -25,13 +25,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                canCrit = true;
 +            }
 +        }
-+        // Paper end
++        // Paper end - Prevent excessive velocity through repeated crits
  
          this.setDeltaMovement(vec3d.x, (double) this.getJumpPower(), vec3d.z);
          if (this.isSprinting()) {
              float f = this.getYRot() * 0.017453292F;
  
-+            if (canCrit) // Paper
++            if (canCrit) // Paper - Prevent excessive velocity through repeated crits
              this.setDeltaMovement(this.getDeltaMovement().add((double) (-Mth.sin(f) * 0.2F), 0.0D, (double) (Mth.cos(f) * 0.2F)));
          }