fix

Author: wdog5

.github/workflows/build.yml

@@ -30,6 +30,10 @@ jobs:
         run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
+      - name: Set Email
+        run: git config --global user.email "you@example.com"
+      - name: Set Account
+        run: git config --global user.name "Your Name"
       - name: Apply Patches
         run: ./gradlew applyPatches
       - name: Build Jar

fabric-loader/minecraft/src/main/java/net/fabricmc/loader/impl/game/minecraft/patch/EntrypointPatch.java

@@ -453,7 +453,7 @@ public void process(FabricLauncher launcher, Function<String, ClassNode> classSo
 								return false;
 							}
 
-							return constructorType.getArgumentTypes()[0].getDescriptor().equals("Ljava/lang/Thread;");
+							return constructorType.getArgumentTypes()[0].getDescriptor().equals("Ljoptsimple/OptionSet;");
 						}
 
 						return false;

paper-server/patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch

@@ -13,24 +13,19 @@
      @Nullable
      private RconThread rconThread;
      public DedicatedServerSettings settings;
-@@ -107,9 +_,23 @@
+@@ -99,6 +_,7 @@
+     private long lastHeartbeat;
+ 
+     public DedicatedServer(
++        joptsimple.OptionSet options, net.minecraft.server.WorldLoader.DataLoadContext worldLoader, // CraftBukkit - Signature changed
+         Thread serverThread,
+         LevelStorageSource.LevelStorageAccess storageSource,
+         PackRepository packRepository,
+@@ -107,9 +_,10 @@
          DataFixer fixerUpper,
          Services services
      ) {
 -        super(serverThread, storageSource, packRepository, worldStem, Proxy.NO_PROXY, fixerUpper, services, LoggingLevelLoadListener.forDedicatedServer());
-+        this(null, null, serverThread, storageSource, packRepository, worldStem, settings, fixerUpper, services);
-+    }
-+
-+    public DedicatedServer(
-+        joptsimple.OptionSet options, net.minecraft.server.WorldLoader.DataLoadContext worldLoader, // CraftBukkit - Signature changed
-+        Thread serverThread,
-+        LevelStorageSource.LevelStorageAccess storageSource,
-+        PackRepository packRepository,
-+        WorldStem worldStem,
-+        DedicatedServerSettings settings,
-+        DataFixer fixerUpper,
-+        Services services
-+    ) {
 +        super(options, worldLoader, serverThread, storageSource, packRepository, worldStem, Proxy.NO_PROXY, fixerUpper, services, LoggingLevelLoadListener.forDedicatedServer()); // CraftBukkit - Signature changed
          this.settings = settings;
 -        this.rconConsoleSource = new RconConsoleSource(this);