Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@5d8e53d Fix CommandSourceStack#bypassSelectorPermissions (#10837)
PaperMC/Paper@ac64751 Use RegistryOps in the correct places (#10843)
PaperMC/Paper@54fbd0c clarify what getEntityId actually returns (#10839)
PaperMC/Paper@b8f2101 Only assign blockstate data if super ctor did not (#10841)
PaperMC/Paper@4f13be9 Do not perform chunk existance check for I/O scheduling
PaperMC/Paper@79c1ce1 Add since to deprecated for removals (#10848)
PaperMC/Paper@88d76d9 Make Bogged implement Shearable (#10844)
PaperMC/Paper@bd5867a Handle alpha channel from potion_contents component (#10808)
PaperMC/Paper@906df69 Prevent internal NPE on ItemStack#damage (#10836)
PaperMC/Paper@79e2cb6 Update upstream (Bukkit/CraftBukkit/Spigot) (#10875)

gradle.properties

@@ -3,7 +3,7 @@ version = 1.20.6-R0.1-SNAPSHOT
 
 mcVersion = 1.20.6
 packageVersion = 1_20_R4
-paperRef = 0513374b1f3410c2dd630f169a0cdf64a349500e
+paperRef = 79e2cb620ef03539390d97940824b38b707918f5
 
 org.gradle.jvmargs = -Xmx2G
 

patches/api/0001-Pufferfish-api-patches.patch

@@ -412,10 +412,10 @@ index c80faa079eca1564847070f0338fc98024639829..e632d51d3487eb4807243b6705999ad1
      }
 
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 07a9c9e254188c251165ca84c8e961fccda01175..5dc64d8c9aeae612fd31af0673f3530a9e777dfc 100644
+index 003bece642b682985625db93cad93026352bfc66..e8ba4f1108f2548a487877027e37d81fc150e042 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -596,7 +596,9 @@ public final class SimplePluginManager implements PluginManager {
+@@ -597,7 +597,9 @@ public final class SimplePluginManager implements PluginManager {
 
      // Paper start
      private void handlePluginException(String msg, Throwable ex, Plugin plugin) {
@@ -425,7 +425,7 @@ index 07a9c9e254188c251165ca84c8e961fccda01175..5dc64d8c9aeae612fd31af0673f3530a
          callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerPluginEnableDisableException(msg, ex, plugin)));
      }
      // Paper end
-@@ -666,9 +668,11 @@ public final class SimplePluginManager implements PluginManager {
+@@ -667,9 +669,11 @@ public final class SimplePluginManager implements PluginManager {
                              ));
                  }
              } catch (Throwable ex) {

patches/server/0002-Pufferfish-Server-Patches.patch

@@ -2008,7 +2008,7 @@ index 300929a406905f5ff1ede664d5b99fb0938d4d2e..01a6b1135420ea659d092ddca499f281
                          throw new SignedMessageChain.DecodeException(SignedMessageChain.DecodeException.OUT_OF_ORDER_CHAT, org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event causes
                      } else {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0ed42fa899721f83b598db05be1b5f321af3614a..64f35b254f322d573fd00232ffe27f3b80297277 100644
+index 3751c2a077bd13bac330b93c6efc2a640a17f4f2..44614349884da05c4983b8474f4f36d67dd514a1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -317,6 +317,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2029,7 +2029,7 @@ index 0ed42fa899721f83b598db05be1b5f321af3614a..64f35b254f322d573fd00232ffe27f3b
      }
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 2eb9c584cc77237f1c82d880a51a3f8b51008d73..6fb2a857d65d7b5de5fd8da224aa8dda79fe3505 100644
+index ad967cc2283f902c76e48a59d59cf0dbdacbb5e3..88cd127a446f6d7d3a5d6ca4a4265105f6f1c8c6 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -233,6 +233,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -2106,7 +2106,7 @@ index 7fb9ba3dadb1eca4a1000ea8cf4d13fed2b7db1e..aa91bc5657716321e23ab5848a53b6b1
              return this.scaledRange(i);
          }
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index b99f50604bafecbc68835974c9ed0caa91911a40..78e3be9cec0f1d8dbb297b40854d08385b1bd2e0 100644
+index fcecfda569d2a8d6b8a7e228831f822fb7327748..3ca8d074eb0918c0e7d5f3f2abb641b3bb60187e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -75,6 +75,9 @@ public class ServerChunkCache extends ChunkSource {
@@ -2656,7 +2656,7 @@ index a46bf73c608641bf1f00fd55242de71a0f2ee06e..ba4b288e8db199ac31a1dbabd4cad522
          return (EntityType) Registry.register(BuiltInRegistries.ENTITY_TYPE, id, (EntityType<T>) type.build(id)); // CraftBukkit - decompile error
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ce01fe82dc1eaaf06ca317ddbc62b7d1b87a48b2..4e81e61889d0345889850a0444ee724e2e5bfde4 100644
+index 21e61bb75ac7ce468bc757633ce678b21bcb9deb..94b54909a2976e51d0940c624c89ecfa23bdc3fa 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -427,7 +427,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -2685,7 +2685,7 @@ index ce01fe82dc1eaaf06ca317ddbc62b7d1b87a48b2..4e81e61889d0345889850a0444ee724e
      @Override
      public boolean hurt(DamageSource source, float amount) {
          if (this.isInvulnerableTo(source)) {
-@@ -2040,6 +2050,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2034,6 +2044,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
          return this.lastClimbablePos;
      }
 
@@ -3945,10 +3945,10 @@ index 88a4a72bb390947dc17e5da09a99b2d1b3ac4621..d52b48181feca2ab9723a7342240bd51
 
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 94a31c8f903eb61eb6d203e8e6fe8fb0beca28b1..daa60d4d15cfef5221f68e4538e477901b3ad459 100644
+index 5db08432b6afd3639688830e717f40ceaf599248..29c1db783eeaca51ec4cbe7c91edfac2ef4c5d1e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1124,7 +1124,7 @@ public final class CraftServer implements Server {
+@@ -1147,7 +1147,7 @@ public final class CraftServer implements Server {
                  plugin.getPluginMeta().getDisplayName(),
                  "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
              ));

patches/server/0004-Add-CloudPlane-configuration.patch

@@ -213,7 +213,7 @@ index 0000000000000000000000000000000000000000..3d12a4fb9e6acb412d80bff777d08771
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 6fb2a857d65d7b5de5fd8da224aa8dda79fe3505..b69eeb58eb93869ed1637b7e98eededf14b13ced 100644
+index 88cd127a446f6d7d3a5d6ca4a4265105f6f1c8c6..25bb923eb430cf8a66745a270d9a6f584417fd71 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -235,6 +235,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -242,18 +242,18 @@ index fdd51dd4a244775a1a172ae435be087a90a03e68..59c135fb5fe94bb0266be319885f0104
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index daa60d4d15cfef5221f68e4538e477901b3ad459..eda4fc3ee28f8bbae1199044a3e73d7e96154082 100644
+index 29c1db783eeaca51ec4cbe7c91edfac2ef4c5d1e..9ce51a8fa92ffec09a5c573ed2a21b2ff79fdd5e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1033,6 +1033,7 @@ public final class CraftServer implements Server {
+@@ -1056,6 +1056,7 @@ public final class CraftServer implements Server {
 
          org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
 +        dev.booky.cloudplane.CloudPlaneConfig.init((File) console.options.valueOf("cloudplane-settings")); // CloudPlane
          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))
-@@ -3030,6 +3031,13 @@ public final class CraftServer implements Server {
+@@ -3053,6 +3054,13 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
 
@@ -268,7 +268,7 @@ index daa60d4d15cfef5221f68e4538e477901b3ad459..eda4fc3ee28f8bbae1199044a3e73d7e
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index fa1c94da6894d37a9d986c1d32aac73ce4bf312d..d853454c04dd1abf6e535bedd29b468d3669f198 100644
+index a1274a4c8edfc2f24e6444cc992712fcdb7c45e8..bc6771049c8b60b00e163147589c4274ba16d432 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -176,6 +176,14 @@ public class Main {