Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@e0ba395d Add missing plugin ticket comparator fixes #13130
PaperMC/Paper@21b49306 Fix diff in FlowingFluid#canPassThroughWall
PaperMC/Paper@dcd7847d Improve server tick loop
PaperMC/Paper@a4a7461c Rebase fixups
PaperMC/Paper@dc66e8cf Return Server#getTPS over minute intervals instead of seconds

purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java.patch

@@ -1,14 +1,15 @@
 --- a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
 +++ b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
-@@ -61,6 +_,7 @@
+@@ -60,7 +_,7 @@
+         Vector<String> vector = new Vector<>();
  
          // Follows CraftServer#getTPS
-         double[] tps = new double[] {
-+            server.tps5s.getAverage(), // Purpur - Add 5 second tps average in /tps
-             server.tps1.getAverage(),
-             server.tps5.getAverage(),
-             server.tps15.getAverage()
-@@ -73,7 +_,7 @@
+-        double[] tps = server.getTPS();
++        double[] tps = server.getTPS(); // Purpur - diff on change
+         String[] tpsAvg = new String[tps.length];
+ 
+         for ( int g = 0; g < tps.length; g++) {
+@@ -69,7 +_,7 @@
          vector.add("Memory use: " + (data.getUsedMem() / 1024L / 1024L) + " mb (" + (data.getFree() * 100L / data.getMax()) + "% free)");
          vector.add("Heap: " + (data.getTotal() / 1024L / 1024L) + " / " + (data.getMax() / 1024L / 1024L) + " mb");
          vector.add("Avg tick: " + DECIMAL_FORMAT.format((double)this.server.getAverageTickTimeNanos() / (double) TimeUtil.NANOSECONDS_PER_MILLISECOND) + " ms");

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -416,6 +_,20 @@
+@@ -417,6 +_,20 @@
          this.paperPluginManager = new io.papermc.paper.plugin.manager.PaperPluginManagerImpl(this, this.commandMap, pluginManager);
          this.pluginManager.paperPluginManager = this.paperPluginManager;
           // Paper end
@@ -21,7 +21,7 @@
  
          CraftRegistry.setMinecraftRegistry(console.registryAccess());
  
-@@ -992,6 +_,7 @@
+@@ -993,6 +_,7 @@
  
          org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
@@ -29,7 +29,7 @@
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && world.getGameRules().getBoolean(GameRules.RULE_SPAWN_MONSTERS)); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -1007,6 +_,7 @@
+@@ -1008,6 +_,7 @@
                  }
              }
              world.spigotConfig.init(); // Spigot
@@ -37,7 +37,7 @@
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -1024,6 +_,7 @@
+@@ -1025,6 +_,7 @@
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
          this.spark.registerCommandBeforePlugins(this); // Paper - spark
@@ -45,7 +45,7 @@
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -1482,6 +_,60 @@
+@@ -1483,6 +_,60 @@
          return true;
      }
  
@@ -106,7 +106,7 @@
      @Override
      public List<Recipe> getRecipesFor(ItemStack result) {
          Preconditions.checkArgument(result != null, "ItemStack cannot be null");
-@@ -2725,6 +_,18 @@
+@@ -2728,6 +_,18 @@
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  
@@ -125,15 +125,7 @@
          @Override
          public void restart() {
              CraftServer.this.restart();
-@@ -2757,6 +_,7 @@
-     @Override
-     public double[] getTPS() {
-         return new double[] {
-+            net.minecraft.server.MinecraftServer.getServer().tps5s.getAverage(), // Purpur - Add 5 second tps average in /tps
-             net.minecraft.server.MinecraftServer.getServer().tps1.getAverage(),
-             net.minecraft.server.MinecraftServer.getServer().tps5.getAverage(),
-             net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
-@@ -2964,4 +_,18 @@
+@@ -2963,4 +_,18 @@
      public void allowPausing(final Plugin plugin, final boolean value) {
          this.console.addPluginAllowingSleep(plugin.getName(), value);
      }

purpur-server/paper-patches/files/src/main/java/org/spigotmc/TicksPerSecondCommand.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-@@ -43,7 +_,7 @@
+@@ -47,7 +_,7 @@
          }
  
          TextComponent.Builder builder = text();