Update Paper

Author: Spottedleaf

folia-server/build.gradle.kts.patch

@@ -71,7 +71,7 @@
              "Build-Number" to (build ?: ""),
              "Build-Time" to buildTime.toString(),
              "Git-Branch" to gitBranch,
-@@ -326,7 +_,7 @@
+@@ -327,7 +_,7 @@
  }
 
  fill {

folia-server/minecraft-patches/features/0001-Region-Threading-Base.patch

@@ -7,7 +7,7 @@ This allows the player to be re-positioned before logging into
 the world without causing thread checks to trip on Folia.
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index a17b622d15221e3936252f52868a855958bf2beb..fbe0ef19bfabfc42d9e0e08e17b08159321b3804 100644
+index ab2b55775fa7079dbf7bc32a4bc2d9281340f1a8..57f93d978fe48fdf6e77b7bfb9f1de060e1a8524 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -729,8 +729,18 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc

folia-server/minecraft-patches/features/0006-Sync-vehicle-position-to-player-position-on-player-d.patch

@@ -39,10 +39,10 @@ index c6a4d52f76e10fcc57b2c49b07fbc2ef9bb90822..6f13870a1b463049dd37cf1c65d0bdec
          // Folia end - region threading
          //this.tickCount++; // Folia - region threading
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 2a8a7aeddffdfed31cd6e1162c0756986049fbab..a2b57f62b745dd21e215f919d335f14f5cb1706f 100644
+index e8204e243a3e038041a2e398fcea9c7d383638f9..07310ae30817fc88227355739074615969b48184 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -4890,6 +4890,80 @@ public abstract class Entity
+@@ -4894,6 +4894,80 @@ public abstract class Entity
          return true;
      }
      // Folia end - region threading

folia-server/minecraft-patches/features/0009-Teleport-desynced-passengers-to-root-vehicle.patch

@@ -359,17 +359,26 @@ index 85b8c1dcc5f988aaab367914e0aeee97f7cb3aed..933de1bf9a141a827f8655e812adc1b0
              }
          }
 diff --git a/src/main/java/io/papermc/paper/command/PaperCommands.java b/src/main/java/io/papermc/paper/command/PaperCommands.java
-index 6dfd0b1a85d518828b15158c01472ae4383b8882..cf9996228b320dd466de706928aa75df6df4340f 100644
+index e81dcd83d0e74969a7bab09ea09d349be5f0a741..963fcbf2b30b6c85d54f0a9888b0bf203fffdb38 100644
 --- a/src/main/java/io/papermc/paper/command/PaperCommands.java
 +++ b/src/main/java/io/papermc/paper/command/PaperCommands.java
-@@ -24,6 +24,7 @@ public final class PaperCommands {
+@@ -23,6 +23,7 @@ public final class PaperCommands {
+ 
      public static void registerCommands(final MinecraftServer server) {
          COMMANDS.put("paper", new PaperCommand("paper"));
-         COMMANDS.put("mspt", new MSPTCommand("mspt"));
 +        COMMANDS.put("tps", new io.papermc.paper.threadedregions.commands.CommandServerHealth()); // Folia - region threading
 
          COMMANDS.forEach((s, command) -> {
              server.server.getCommandMap().register(s, "Paper", command);
+@@ -31,7 +32,7 @@ public final class PaperCommands {
+ 
+     public static void registerCommands() {
+         // Paper commands go here
+-        registerInternalCommand(PaperMSPTCommand.create(), "paper", PaperMSPTCommand.DESCRIPTION, List.of(), Set.of());
++        //registerInternalCommand(PaperMSPTCommand.create(), "paper", PaperMSPTCommand.DESCRIPTION, List.of(), Set.of()); // Folia - region threading
+         registerInternalCommand(PaperVersionCommand.create(), "bukkit", PaperVersionCommand.DESCRIPTION, List.of("ver", "about"), Set.of());
+         registerInternalCommand(PaperPluginsCommand.create(), "bukkit", PaperPluginsCommand.DESCRIPTION, List.of("pl"), Set.of());
+     }
 diff --git a/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java b/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java
 index a4212e9b0df55580b60666bc306d812d6f9531ba..4ea18bd448f211e13ff49d254a1edcfb77a653fb 100644
 --- a/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java
@@ -2184,10 +2193,10 @@ index 000c5ea5d39d5ab6e5592012ab1cc7ee547505dc..ab2ee478c53923be85f5a6d4971bed5b
      }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index e45f9514e4b593111e827a2fc083381aa8072f67..efcb8b97cd685e1243c770bf3e8daf03615abb1d 100644
+index edf63e430b12e0f426b730e8df6ae7fb63258f9e..00749be3b16fd09c6b952c93631c808ff5657f20 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -108,6 +108,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -110,6 +110,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return this.apiScheduler;
      };
      // Paper end - Folia schedulers
@@ -2199,15 +2208,15 @@ index e45f9514e4b593111e827a2fc083381aa8072f67..efcb8b97cd685e1243c770bf3e8daf03
 
      public CraftEntity(final CraftServer server, final Entity entity) {
          this.server = server;
-@@ -142,6 +147,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -144,6 +149,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      }
 
      public Entity getHandle() {
 +        ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread(this.entity, "Accessing entity state off owning region's thread"); // Folia - region threading
          return this.entity;
      }
 
-@@ -296,6 +302,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -298,6 +304,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      }
 
      protected boolean teleport0(Location location, TeleportCause cause, TeleportFlag... flags) {
@@ -2219,7 +2228,7 @@ index e45f9514e4b593111e827a2fc083381aa8072f67..efcb8b97cd685e1243c770bf3e8daf03
          Entity entity = this.getHandle();
          if (!entity.isAlive() || !entity.valid) {
              return false;
-@@ -742,7 +753,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -747,7 +758,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          ImmutableSet.Builder<Player> players = ImmutableSet.builder();
 
          ServerLevel world = ((CraftWorld) this.getWorld()).getHandle();
@@ -2228,7 +2237,7 @@ index e45f9514e4b593111e827a2fc083381aa8072f67..efcb8b97cd685e1243c770bf3e8daf03
 
          if (entityTracker != null) {
              for (ServerPlayerConnection connection : entityTracker.seenBy) {
-@@ -759,7 +770,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -764,7 +775,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          Preconditions.checkArgument(player != null, "Player cannot be null");
 
          ServerLevel world = ((CraftWorld) this.getWorld()).getHandle();
@@ -2237,7 +2246,7 @@ index e45f9514e4b593111e827a2fc083381aa8072f67..efcb8b97cd685e1243c770bf3e8daf03
          if (entityTracker == null) return false;
 
          return entityTracker.seenBy.contains(((CraftPlayer) player).getHandle().connection);
-@@ -1074,7 +1085,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1079,7 +1090,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          }
 
          ServerLevel world = ((CraftWorld) this.getWorld()).getHandle();
@@ -2246,7 +2255,7 @@ index e45f9514e4b593111e827a2fc083381aa8072f67..efcb8b97cd685e1243c770bf3e8daf03
 
          if (entityTracker == null) {
              return;
-@@ -1091,7 +1102,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1096,7 +1107,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          }
 
          ServerLevel world = ((CraftWorld) this.getWorld()).getHandle();
@@ -2255,7 +2264,7 @@ index e45f9514e4b593111e827a2fc083381aa8072f67..efcb8b97cd685e1243c770bf3e8daf03
 
          if (entityTracker == null) {
              return;
-@@ -1127,26 +1138,43 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1132,26 +1143,43 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          location.checkFinite();
          Location locationClone = location.clone(); // clone so we don't need to worry about mutations after this call.
 
@@ -2317,7 +2326,7 @@ index e45f9514e4b593111e827a2fc083381aa8072f67..efcb8b97cd685e1243c770bf3e8daf03
      }
      // Paper end - more teleport API / async chunk API
 
-@@ -1219,8 +1247,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1224,8 +1252,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
 
      @Override
      public Set<org.bukkit.entity.Player> getTrackedPlayers() {

folia-server/paper-patches/features/0001-Region-Threading-Base.patch

@@ -77,12 +77,12 @@ relative to the parent, exactly similar to the D field of Timers,
 where Y is the total number of times the counter is invoked.
 
 diff --git a/src/main/java/io/papermc/paper/command/PaperCommands.java b/src/main/java/io/papermc/paper/command/PaperCommands.java
-index cf9996228b320dd466de706928aa75df6df4340f..3deca0b4e95609dc95376a86b5cbd525729a1031 100644
+index 963fcbf2b30b6c85d54f0a9888b0bf203fffdb38..6216147f4d4c04ba616375430a91232d5ebe838a 100644
 --- a/src/main/java/io/papermc/paper/command/PaperCommands.java
 +++ b/src/main/java/io/papermc/paper/command/PaperCommands.java
-@@ -25,6 +25,7 @@ public final class PaperCommands {
+@@ -24,6 +24,7 @@ public final class PaperCommands {
+     public static void registerCommands(final MinecraftServer server) {
          COMMANDS.put("paper", new PaperCommand("paper"));
-         COMMANDS.put("mspt", new MSPTCommand("mspt"));
          COMMANDS.put("tps", new io.papermc.paper.threadedregions.commands.CommandServerHealth()); // Folia - region threading
 +        COMMANDS.put("profiler", new io.papermc.paper.threadedregions.commands.CommandProfiler()); // Folia - region threading - profiler
 

folia-server/paper-patches/features/0005-Region-profiler.patch

@@ -5,7 +5,7 @@ mcVersion=26.2
 apiVersion=26.2
 channel=BETA
 
-paperRef=1569b8dc7646ba56a4040042eaeb870e76beee56
+paperRef=5563e58283f7771bd5ace9baad8b68614e37ad16
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true