R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 1.19.4 into 1.20

Browse Source
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
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java
View File

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