Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a3dfe6d Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6722)
PaperMC/Paper@fdd5c65 Fix CraftCriteria defaults map (#6723)
PaperMC/Paper@d54e8c5 Support components in command permission msgs (#6676)
PaperMC/Paper@e155002 Fix EntityPortalExitEvent not being called (#5617)
PaperMC/Paper@e4d8c47 Update adventure and fix command perm serialization NPE (#6729)
PaperMC/Paper@0cdeeef Remove unnecessary Velocity repo from server (#6730)
PaperMC/Paper@a419941 Add download link to the /version command (#6482)
PaperMC/Paper@8e661c6 Deprecate API methods added by 'Close Plugin Class Loaders on Disable' (#6737)
PaperMC/Paper@7991c4b Fix upstream block state factories (#6738)
PaperMC/Paper@bfe5622 Fix EntityPortalExitEvent target location
PaperMC/Paper@3391ccf Discard out of bounds chunks during regionfile header recalculation
PaperMC/Paper@cf4af9f Add config setting for logging player ip addresses. (#6342)
PaperMC/Paper@6dfc0f5 Add getChangedBlockData() property to BlockPhysicsEvent to expose BlockData (#6743)
PaperMC/Paper@0d1e187 Fix kicking ops when whitelist is reloaded (MC-171420) (#6742)
PaperMC/Paper@975f2e5 Filter ip address on join if setting is true (#6748)

patches/server/0004-Purpur-config-files.patch

@@ -30,7 +30,7 @@ index f5d01bce4d5547b4aeca96b7962b2090f47ea541..05f1b6d103ec20f196b60944f5bc0073
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 7037f868f0e925a79fbf6be8f3810d9e75133fda..2ac56ca31d57991aef4fd77212cd9a537753b8d7 100644
+index 84ed6b5e4f0b6ef998492db769275a509fa51b14..d694ee295d3197a928f8f0ff03413aa02bedc108 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -118,6 +118,11 @@ public class PaperConfig {
@@ -101,10 +101,10 @@ index d9bee4649ce376e8ef44720161bbeb4139e1132a..25cd8b550a81cf144fed62f32320cd2e
          io.papermc.paper.util.ObfHelper.INSTANCE.getClass(); // load mappings for stacktrace deobf and etc.
          io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 6f4e6105aa1d6546daa2424f57972fd29db25fa3..4c55bb04ff41fabb47c6477ba33e0e0aabd1c843 100644
+index 8b8daa771288492b4a02cb40c1b376b65e210e5b..d59f402622b93abc44b331f42cccdb785689aeda 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -167,6 +167,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -168,6 +168,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper
      public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
  
@@ -113,7 +113,7 @@ index 6f4e6105aa1d6546daa2424f57972fd29db25fa3..4c55bb04ff41fabb47c6477ba33e0e0a
      public final co.aikar.timings.WorldTimingsHandler timings; // Paper
      public static BlockPos lastPhysicsProblem; // Spigot
      private org.spigotmc.TickLimiter entityLimiter;
-@@ -315,6 +317,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -316,6 +318,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, final DimensionType dimensionmanager, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.concurrent.Executor executor) { // Paper - Anti-Xray - Pass executor
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
          this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), this.spigotConfig); // Paper
@@ -460,10 +460,10 @@ index 0000000000000000000000000000000000000000..6e7f56fe2b78d7a09d5d130f2c88338f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index aa4bb2dc68bab8773271567633cfe6d234d98155..597b6a011c1065b806d23db634bb47e8e97363e8 100644
+index e28807ab2613982c87d8c7daab3bea60c9f0c137..f486ad6d2cf29bf1df4dc9367fa4ebaaab425010 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -895,6 +895,7 @@ public final class CraftServer implements Server {
+@@ -907,6 +907,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
@@ -471,7 +471,7 @@ index aa4bb2dc68bab8773271567633cfe6d234d98155..597b6a011c1065b806d23db634bb47e8
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -929,6 +930,7 @@ public final class CraftServer implements Server {
+@@ -947,6 +948,7 @@ public final class CraftServer implements Server {
              }
              world.spigotConfig.init(); // Spigot
              world.paperConfig.init(); // Paper
@@ -479,7 +479,7 @@ index aa4bb2dc68bab8773271567633cfe6d234d98155..597b6a011c1065b806d23db634bb47e8
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -944,6 +946,7 @@ public final class CraftServer implements Server {
+@@ -962,6 +964,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -487,7 +487,7 @@ index aa4bb2dc68bab8773271567633cfe6d234d98155..597b6a011c1065b806d23db634bb47e8
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2526,6 +2529,18 @@ public final class CraftServer implements Server {
+@@ -2554,6 +2557,18 @@ public final class CraftServer implements Server {
              return com.destroystokyo.paper.PaperConfig.config;
          }