[ci skip] Fixup last commit

patches/server/Add-Early-Warning-Feature-to-WatchDog.patch

@@ -111,20 +111,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Paper bug." ); // Paper
                  log.log( Level.SEVERE, "If you see a plugin in the Server thread dump below, then please report it to that author" );
 @@ -0,0 +0,0 @@ public class WatchdogThread extends Thread
-                     log.log( Level.SEVERE, "near " + net.minecraft.world.level.Level.lastPhysicsProblem );
+                     }
                  }
-                 //
+                 // Paper end
-+                // Paper start - Warn in watchdog if an excessive velocity was ever set
-+                if (org.bukkit.craftbukkit.CraftServer.excessiveVelEx != null) {
-+                    log.log( Level.SEVERE, "------------------------------" );
-+                    log.log( Level.SEVERE, "During the run of the server, a plugin set an excessive velocity on an entity" );
-+                    log.log( Level.SEVERE, "This may be the cause of the issue, or it may be entirely unrelated" );
-+                    log.log( Level.SEVERE, org.bukkit.craftbukkit.CraftServer.excessiveVelEx.getMessage());
-+                    for (StackTraceElement stack : org.bukkit.craftbukkit.CraftServer.excessiveVelEx.getStackTrace()) {
-+                        log.log(Level.SEVERE, "\t\t" + stack);
-+                    }
-+                }
-+                // Paper end
 +                } else
 +                {
 +                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PAPER - THIS IS NOT A BUG OR A CRASH  - " + Bukkit.getServer().getVersion() + " ---");

patches/server/Add-debug-for-sync-chunk-loads.patch

@@ -201,7 +201,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          commands.put(Set.of("version"), new VersionCommand());
          commands.put(Set.of("dumpplugins"), new DumpPluginsCommand());
          commands.put(Set.of("fixlight"), new FixLightCommand());
-+        commands.put(Set.of("debug", "chunkinfo", "holderinfo"), new ChunkDebugCommand());
++        commands.put(Set.of("syncloadinfo"), new SyncLoadInfoCommand());
  
          return commands.entrySet().stream()
              .flatMap(entry -> entry.getKey().stream().map(s -> Map.entry(s, entry.getValue())))

patches/server/Add-paper-dumplisteners-command.patch

@@ -10,8 +10,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/io/papermc/paper/command/PaperCommand.java
 +++ b/src/main/java/io/papermc/paper/command/PaperCommand.java
 @@ -0,0 +0,0 @@ public final class PaperCommand extends Command {
-         commands.put(Set.of("debug", "chunkinfo", "holderinfo"), new ChunkDebugCommand()); //
          commands.put(Set.of("dumpitem"), new DumpItemCommand());
+         commands.put(Set.of("debug", "chunkinfo", "holderinfo"), new ChunkDebugCommand());
          commands.put(Set.of("mobcaps", "playermobcaps"), new MobcapsCommand());
 +        commands.put(Set.of("dumplisteners"), new DumpListenersCommand());
  

patches/server/Add-paper-mobcaps-and-paper-playermobcaps.patch

@@ -14,9 +14,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/io/papermc/paper/command/PaperCommand.java
 +++ b/src/main/java/io/papermc/paper/command/PaperCommand.java
 @@ -0,0 +0,0 @@ public final class PaperCommand extends Command {
-         commands.put(Set.of("fixlight"), new FixLightCommand());
+         commands.put(Set.of("syncloadinfo"), new SyncLoadInfoCommand());
-         commands.put(Set.of("debug", "chunkinfo", "holderinfo"), new ChunkDebugCommand()); //
          commands.put(Set.of("dumpitem"), new DumpItemCommand());
+         commands.put(Set.of("debug", "chunkinfo", "holderinfo"), new ChunkDebugCommand());
 +        commands.put(Set.of("mobcaps", "playermobcaps"), new MobcapsCommand());
  
          return commands.entrySet().stream()

patches/server/Add-velocity-warnings.patch

@@ -66,20 +66,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -0,0 +0,0 @@ public class WatchdogThread extends Thread
-         }
+                     log.log( Level.SEVERE, "near " + net.minecraft.world.level.Level.lastPhysicsProblem );
-         log.log( Level.SEVERE, "\tStack:" );
+                 }
-         //
+                 //
-+        // Paper start - Warn in watchdog if an excessive velocity was ever set
++                // Paper start - Warn in watchdog if an excessive velocity was ever set
-+        if (org.bukkit.craftbukkit.CraftServer.excessiveVelEx != null) {
++                if (org.bukkit.craftbukkit.CraftServer.excessiveVelEx != null) {
-+            log.log(Level.SEVERE, "------------------------------");
++                    log.log(Level.SEVERE, "------------------------------");
-+            log.log(Level.SEVERE, "During the run of the server, a plugin set an excessive velocity on an entity");
++                    log.log(Level.SEVERE, "During the run of the server, a plugin set an excessive velocity on an entity");
-+            log.log(Level.SEVERE, "This may be the cause of the issue, or it may be entirely unrelated");
++                    log.log(Level.SEVERE, "This may be the cause of the issue, or it may be entirely unrelated");
-+            log.log(Level.SEVERE, org.bukkit.craftbukkit.CraftServer.excessiveVelEx.getMessage());
++                    log.log(Level.SEVERE, org.bukkit.craftbukkit.CraftServer.excessiveVelEx.getMessage());
-+            for (StackTraceElement stack : org.bukkit.craftbukkit.CraftServer.excessiveVelEx.getStackTrace()) {
++                    for (StackTraceElement stack : org.bukkit.craftbukkit.CraftServer.excessiveVelEx.getStackTrace()) {
-+                log.log( Level.SEVERE, "\t\t" + stack );
++                        log.log( Level.SEVERE, "\t\t" + stack );
-+            }
++                    }
-+        }
++                }
-+        // Paper end
++                // Paper end
-         for ( StackTraceElement stack : thread.getStackTrace() )
+                 log.log( Level.SEVERE, "------------------------------" );
-         {
+                 log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
-             log.log( Level.SEVERE, "\t\t" + stack );
+                 WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );

patches/server/Chunk-Save-Reattempt.patch

@@ -29,8 +29,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // Paper start - Chunk save reattempt
 +        int attempts = 0;
 +        Exception lastException = null;
-+        while (attempts++ < 5) {
++        while (attempts++ < 5) { try {
-+            try {
 +        // Paper end - Chunk save reattempt
  
          if (nbt == null) {

patches/server/Deobfuscate-stacktraces-in-log-messages-crash-report.patch

@@ -642,24 +642,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -0,0 +0,0 @@ public class WatchdogThread extends Thread
-                     log.log( Level.SEVERE, "During the run of the server, a plugin set an excessive velocity on an entity" );
+                     log.log(Level.SEVERE, "During the run of the server, a plugin set an excessive velocity on an entity");
-                     log.log( Level.SEVERE, "This may be the cause of the issue, or it may be entirely unrelated" );
+                     log.log(Level.SEVERE, "This may be the cause of the issue, or it may be entirely unrelated");
-                     log.log( Level.SEVERE, org.bukkit.craftbukkit.CraftServer.excessiveVelEx.getMessage());
+                     log.log(Level.SEVERE, org.bukkit.craftbukkit.CraftServer.excessiveVelEx.getMessage());
 -                    for (StackTraceElement stack : org.bukkit.craftbukkit.CraftServer.excessiveVelEx.getStackTrace()) {
 +                    for (StackTraceElement stack : io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateStacktrace(org.bukkit.craftbukkit.CraftServer.excessiveVelEx.getStackTrace())) { // Paper
-                         log.log(Level.SEVERE, "\t\t" + stack);
+                         log.log( Level.SEVERE, "\t\t" + stack );
                      }
                  }
 @@ -0,0 +0,0 @@ public class WatchdogThread extends Thread
-             log.log(Level.SEVERE, "During the run of the server, a plugin set an excessive velocity on an entity");
-             log.log(Level.SEVERE, "This may be the cause of the issue, or it may be entirely unrelated");
-             log.log(Level.SEVERE, org.bukkit.craftbukkit.CraftServer.excessiveVelEx.getMessage());
--            for (StackTraceElement stack : org.bukkit.craftbukkit.CraftServer.excessiveVelEx.getStackTrace()) {
-+            for (StackTraceElement stack : io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateStacktrace(org.bukkit.craftbukkit.CraftServer.excessiveVelEx.getStackTrace())) { // Paper
-                 log.log( Level.SEVERE, "\t\t" + stack );
-             }
          }
-         // Paper end
+         log.log( Level.SEVERE, "\tStack:" );
+         //
 -        for ( StackTraceElement stack : thread.getStackTrace() )
 +        for ( StackTraceElement stack : io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateStacktrace(thread.getStackTrace()) ) // Paper
          {

patches/server/Paper-dumpitem-command.patch

@@ -12,7 +12,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public final class PaperCommand extends Command {
          commands.put(Set.of("dumpplugins"), new DumpPluginsCommand());
          commands.put(Set.of("fixlight"), new FixLightCommand());
-         commands.put(Set.of("debug", "chunkinfo", "holderinfo"), new ChunkDebugCommand());
+         commands.put(Set.of("syncloadinfo"), new SyncLoadInfoCommand());
 +        commands.put(Set.of("dumpitem"), new DumpItemCommand());
  
          return commands.entrySet().stream()

patches/server/Rewrite-chunk-system.patch

@@ -15286,14 +15286,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/io/papermc/paper/command/PaperCommand.java
 +++ b/src/main/java/io/papermc/paper/command/PaperCommand.java
 @@ -0,0 +0,0 @@ public final class PaperCommand extends Command {
-         commands.put(Set.of("version"), new VersionCommand());
-         commands.put(Set.of("dumpplugins"), new DumpPluginsCommand());
          commands.put(Set.of("fixlight"), new FixLightCommand());
--        commands.put(Set.of("debug", "chunkinfo", "holderinfo"), new ChunkDebugCommand());
+         commands.put(Set.of("syncloadinfo"), new SyncLoadInfoCommand());
-+        commands.put(Set.of("debug", "chunkinfo", "holderinfo"), new ChunkDebugCommand()); //
          commands.put(Set.of("dumpitem"), new DumpItemCommand());
++        commands.put(Set.of("debug", "chunkinfo", "holderinfo"), new ChunkDebugCommand());
  
          return commands.entrySet().stream()
+             .flatMap(entry -> entry.getKey().stream().map(s -> Map.entry(s, entry.getValue())))
 diff --git a/src/main/java/io/papermc/paper/command/subcommands/ChunkDebugCommand.java b/src/main/java/io/papermc/paper/command/subcommands/ChunkDebugCommand.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
@@ -22154,23 +22153,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        if (nbt == null && regionfile == null) {
 +            return;
 +        }
++        try { // Try finally to unlock the region file
 +        // Paper end - rewrite chunk system
          // Paper start - Chunk save reattempt
          int attempts = 0;
          Exception lastException = null;
 @@ -0,0 +0,0 @@ public class RegionFileStorage implements AutoCloseable {
-                 return;
+             net.minecraft.server.MinecraftServer.LOGGER.error("Failed to save chunk {}", pos, lastException);
-             } catch (Exception ex)  {
-                 lastException = ex;
-+                // Paper start - rewrite chunk system
-+            } finally {
-+                regionfile.fileLock.unlock();
-+                // Paper end - rewrite chunk system
-             }
          }
- 
-@@ -0,0 +0,0 @@ public class RegionFileStorage implements AutoCloseable {
          // Paper end - Chunk save reattempt
++        // Paper start - rewrite chunk system
++        } finally {
++            regionfile.fileLock.unlock();
++        }
++        // Paper end - rewrite chunk system
      }
  
 -    public void close() throws IOException {