First review pass

Author: Spottedleaf

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

@@ -7,10 +7,10 @@ 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 d02e15fca5aceede3466eef3c3ab67c14c56f160..2da37f8df788a1bb6cb63566b2b74d7013def037 100644
+index 73f641d4035293c3a3c6abb8fa7c61a38c4012cb..0dbc2d45bd367342a15024e72458f7c18370a369 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -721,8 +721,18 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -718,8 +718,18 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
          Optional<ValueInput> optional = input.child("RootVehicle");
          if (!optional.isEmpty()) {
              ServerLevel serverLevel = this.level();

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

@@ -1446,11 +1446,11 @@ index 0000000000000000000000000000000000000000..08a0f331ac8895acb1d0fe163d85037c
 +    }
 +}
 diff --git a/net/minecraft/network/PacketProcessor.java b/net/minecraft/network/PacketProcessor.java
-index 217d6b3077ff0cc9524104f0aeb043e2271e96d1..1f2a7435aacf9925228de8eb3a5d38eff437ba82 100644
+index 406849772f764eb5f5f986ea5e3e0213f83b3255..758cb258a7e0478bfaacfc1b6c93ce8a501b0e6c 100644
 --- a/net/minecraft/network/PacketProcessor.java
 +++ b/net/minecraft/network/PacketProcessor.java
 @@ -103,7 +103,10 @@ public class PacketProcessor implements AutoCloseable {
-             if (this.listener instanceof net.minecraft.server.network.ServerCommonPacketListenerImpl serverCommonPacketListener && serverCommonPacketListener.processedDisconnect) return; // Paper - Don't handle sync packets for kicked players
+             if (this.listener instanceof net.minecraft.server.network.ServerCommonPacketListenerImpl serverCommonPacketListener && (serverCommonPacketListener.processedDisconnect || serverCommonPacketListener.handledDisconnect)) return; // Paper - Don't handle sync packets for kicked players // Folia - correctly handle cases where the configuration listener disconnects, ensure that no login packets get processed
              if (this.listener.shouldHandleMessage(this.packet)) {
                  try {
 +                    final ca.spottedleaf.leafprofiler.RegionizedProfiler.Handle profiler = io.papermc.paper.threadedregions.TickRegionScheduler.getProfiler(); // Folia - profiler
@@ -1461,7 +1461,7 @@ index 217d6b3077ff0cc9524104f0aeb043e2271e96d1..1f2a7435aacf9925228de8eb3a5d38ef
                      if (var3 instanceof ReportedException reportedException && reportedException.getCause() instanceof OutOfMemoryError) {
                          throw PacketUtils.makeReportedException(var3, this.packet, this.listener);
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 2ab577f545330efa8ee27999c99301a062a79307..f887361fcce734f42f11bca3e0029deb0141bab6 100644
+index ae5ef245999e456612edc6c566e8a8c302684fb7..bcbce98f97169f98053badeabf2d20f3a798b488 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -1658,6 +1658,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1938,7 +1938,7 @@ index abccad13c2bb3a33e98ad8eb6d7f08c0ef021811..0590d5723854a03a59fe9471710802f4
          }
      }
 diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
-index 40d8a43b6b4a3fdb623a796dcd219cabc8632d7c..28e89704793676b1d47afbbc1b1472b14fce9d84 100644
+index 9f7fa145f7f6a765c668dc7754626a91bef4ce6a..6809547216f9767d600cc4bf0bff43d572161417 100644
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
 @@ -194,6 +194,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl

folia-server/minecraft-patches/features/0007-Region-profiler.patch

@@ -929,7 +929,7 @@ index b2961752b50e98d95adf3af4f658e2fdb2127d43..51b54104eb70f64a548f37eeab1a4446
 
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6cd3469d49f0e56f212d393f133205aa3b295a88..df936767a7d7a252d362bd97cad4aaf093e70ab0 100644
+index 6cd3469d49f0e56f212d393f133205aa3b295a88..d66f6b829dda61823ddb238d31a9d9de381741a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -239,7 +239,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -1172,7 +1172,7 @@ index 6cd3469d49f0e56f212d393f133205aa3b295a88..df936767a7d7a252d362bd97cad4aaf0
          Preconditions.checkArgument(spawnCategory != null, "SpawnCategory cannot be null");
          Preconditions.checkArgument(CraftSpawnCategory.isValidForLimits(spawnCategory), "SpawnCategory.%s are not supported", spawnCategory);
 
-@@ -1498,26 +1518,31 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1498,21 +1518,25 @@ public class CraftWorld extends CraftRegionAccessor implements World {
 
      @Override
      public void setMetadata(String metadataKey, MetadataValue newMetadataValue) {
@@ -1198,21 +1198,15 @@ index 6cd3469d49f0e56f212d393f133205aa3b295a88..df936767a7d7a252d362bd97cad4aaf0
          this.server.getWorldMetadata().removeMetadata(this, metadataKey, owningPlugin);
      }
 
-     @Override
-     public int getSpawnLimit(SpawnCategory spawnCategory) {
-+        io.papermc.paper.threadedregions.RegionizedServer.ensureGlobalTickThread("Cannot modify server settings off of the global region"); // Folia - region threading
-         Preconditions.checkArgument(spawnCategory != null, "SpawnCategory cannot be null");
-         Preconditions.checkArgument(CraftSpawnCategory.isValidForLimits(spawnCategory), "SpawnCategory.%s are not supported", spawnCategory);
- 
-@@ -1534,6 +1559,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1534,6 +1558,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
 
      @Override
      public void setSpawnLimit(SpawnCategory spawnCategory, int limit) {
 +        io.papermc.paper.threadedregions.RegionizedServer.ensureGlobalTickThread("Cannot modify server settings off of the global region"); // Folia - region threading
          Preconditions.checkArgument(spawnCategory != null, "SpawnCategory cannot be null");
          Preconditions.checkArgument(CraftSpawnCategory.isValidForLimits(spawnCategory), "SpawnCategory.%s are not supported", spawnCategory);
 
-@@ -1591,7 +1617,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1591,7 +1616,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          if (!(entity instanceof CraftEntity craftEntity) || entity.getWorld() != this || sound == null || category == null) return;
 
          ClientboundSoundEntityPacket packet = new ClientboundSoundEntityPacket(CraftSound.bukkitToMinecraftHolder(sound), net.minecraft.sounds.SoundSource.valueOf(category.name()), craftEntity.getHandle(), volume, pitch, seed);
@@ -1221,7 +1215,7 @@ index 6cd3469d49f0e56f212d393f133205aa3b295a88..df936767a7d7a252d362bd97cad4aaf0
          if (entityTracker != null) {
              entityTracker.sendToTrackingPlayersAndSelf(packet);
          }
-@@ -1612,7 +1638,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1612,7 +1637,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          if (!(entity instanceof CraftEntity craftEntity) || entity.getWorld() != this || sound == null || category == null) return;
 
          ClientboundSoundEntityPacket packet = new ClientboundSoundEntityPacket(Holder.direct(SoundEvent.createVariableRangeEvent(Identifier.parse(sound))), net.minecraft.sounds.SoundSource.valueOf(category.name()), craftEntity.getHandle(), volume, pitch, seed);
@@ -1230,23 +1224,23 @@ index 6cd3469d49f0e56f212d393f133205aa3b295a88..df936767a7d7a252d362bd97cad4aaf0
          if (entityTracker != null) {
              entityTracker.sendToTrackingPlayersAndSelf(packet);
          }
-@@ -1663,6 +1689,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1663,6 +1688,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @SuppressWarnings({"unchecked", "rawtypes"})
      @Override
      public boolean setGameRuleValue(String rule, String value) {
 +        io.papermc.paper.threadedregions.RegionizedServer.ensureGlobalTickThread("Cannot modify server settings off of the global region"); // Folia - region threading
          // No null values allowed
          if (rule == null || value == null) return false;
 
-@@ -1726,6 +1753,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1726,6 +1752,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
 
      @Override
      public <T> boolean setGameRule(org.bukkit.@NotNull GameRule<T> rule, @NotNull T newValue) {
 +        io.papermc.paper.threadedregions.RegionizedServer.ensureGlobalTickThread("Cannot modify server settings off of the global region"); // Folia - region threading
          Preconditions.checkArgument(rule != null, "GameRule cannot be null");
          Preconditions.checkArgument(newValue != null, "GameRule value cannot be null");
 
-@@ -1879,6 +1907,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1879,6 +1906,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
 
      @Override
      public void sendGameEvent(Entity sourceEntity, org.bukkit.GameEvent gameEvent, Vector position) {
@@ -1259,7 +1253,7 @@ index 6cd3469d49f0e56f212d393f133205aa3b295a88..df936767a7d7a252d362bd97cad4aaf0
          getHandle().gameEvent(sourceEntity != null ? ((CraftEntity) sourceEntity).getHandle(): null, net.minecraft.core.registries.BuiltInRegistries.GAME_EVENT.get(org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(gameEvent.getKey())).orElseThrow(), org.bukkit.craftbukkit.util.CraftVector.toBlockPos(position));
      }
      // Paper end
-@@ -1908,7 +1942,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1908,7 +1941,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          Preconditions.checkArgument(radius >= 0, "Radius value (%s) cannot be negative", radius);
 
          Raids persistentRaid = this.world.getRaids();

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

@@ -1,6 +1,9 @@
 group=dev.folia
 version=1.21.11-R0.1-SNAPSHOT
 mcVersion=1.21.11
+# This is the current API version for use in (paper-)plugin.yml files
+# During snapshot cycles this should be the anticipated version of the release target
+apiVersion=1.21.11
 
 paperRef=e5e2c50ed3f7a6e4dbe7451c089cb1ad3f77f8f9
 

gradle.properties

@@ -0,0 +1,4 @@
+- world loading structure: dubious handling of custom generator spawn selection (MinecraftServer#setInitialSpawn)
+
+- chk player login logic
+- chk entity/player teleport/respawn logic