Merge 1.19.4 into 1.20

This commit is contained in:
embeddedt 2023-06-27 11:04:06 -04:00
commit ca60a13bb4
No known key found for this signature in database
GPG Key ID: A69433EC199B5613

View File

@ -71,7 +71,7 @@ public class SparkLaunchProfiler {
SparkSamplerProtos.SamplerData output = sampler.toProto(platform, new Sampler.ExportProps()
.creator(new CommandSender.Data(commandSender.getName(), commandSender.getUniqueId()))
.comment("Stage: " + key)
.mergeMode(() -> MergeMode.separateParentCalls(new MethodDisambiguator()))
.mergeMode(() -> MergeMode.sameMethod(new MethodDisambiguator()))
.classSourceLookup(platform::createClassSourceLookup));
try {
String urlKey = platform.getBytebinClient().postContent(output, "application/x-spark-sampler").key();