From 922d0f26e14bdad4b5bb997da43d1c3318d354ca Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Tue, 27 Jun 2023 11:01:17 -0400
Subject: [PATCH] Use same merge mode as default Spark

---
 .../embeddedt/modernfix/fabric/spark/SparkLaunchProfiler.java   | 2 +-
 .../embeddedt/modernfix/forge/spark/SparkLaunchProfiler.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fabric/src/main/java/org/embeddedt/modernfix/fabric/spark/SparkLaunchProfiler.java b/fabric/src/main/java/org/embeddedt/modernfix/fabric/spark/SparkLaunchProfiler.java
index 490d4d76..10ed7cfa 100644
--- a/fabric/src/main/java/org/embeddedt/modernfix/fabric/spark/SparkLaunchProfiler.java
+++ b/fabric/src/main/java/org/embeddedt/modernfix/fabric/spark/SparkLaunchProfiler.java
@@ -71,7 +71,7 @@ public class SparkLaunchProfiler {
     private static void output(String key, Sampler sampler) {
         executor.execute(() -> {
             ModernFixMixinPlugin.instance.logger.warn("Stage [{}] profiler has stopped! Uploading results...", key);
-            byte[] output = sampler.formCompressedDataPayload(new Sampler.ExportProps(platformInfo, commandSender, ThreadNodeOrder.BY_TIME, "Stage: " + key, MergeMode.separateParentCalls(new MethodDisambiguator()), platform.getClassSourceLookup()));
+            byte[] output = sampler.formCompressedDataPayload(new Sampler.ExportProps(platformInfo, commandSender, ThreadNodeOrder.BY_TIME, "Stage: " + key, MergeMode.sameMethod(new MethodDisambiguator()), platform.getClassSourceLookup()));
             try {
                 String urlKey = SparkPlatform.BYTEBIN_CLIENT.postContent(output, mediaType).key();
                 String url = "https://spark.lucko.me/" + urlKey;
diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/spark/SparkLaunchProfiler.java b/forge/src/main/java/org/embeddedt/modernfix/forge/spark/SparkLaunchProfiler.java
index 27a952dd..ad67ed64 100644
--- a/forge/src/main/java/org/embeddedt/modernfix/forge/spark/SparkLaunchProfiler.java
+++ b/forge/src/main/java/org/embeddedt/modernfix/forge/spark/SparkLaunchProfiler.java
@@ -72,7 +72,7 @@ public class SparkLaunchProfiler {
     private static void output(String key, Sampler sampler) {
         executor.execute(() -> {
             ModernFixMixinPlugin.instance.logger.warn("Stage [{}] profiler has stopped! Uploading results...", key);
-            SparkSamplerProtos.SamplerData output = sampler.toProto(platform, commandSender, ThreadNodeOrder.BY_TIME, "Stage: " + key, MergeMode.separateParentCalls(new MethodDisambiguator()), platform.createClassSourceLookup());
+            SparkSamplerProtos.SamplerData output = sampler.toProto(platform, commandSender, ThreadNodeOrder.BY_TIME, "Stage: " + key, MergeMode.sameMethod(new MethodDisambiguator()), platform.createClassSourceLookup());
             try {
                 String urlKey = platform.getBytebinClient().postContent(output, mediaType).key();
                 String url = "https://spark.lucko.me/" + urlKey;