Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@6520ca1 Fix main thread priority being lowered (#9488)
PaperMC/Paper@47b805f Don't let player loot if reloot time is disabled (#9615)
PaperMC/Paper@73af2d4 Add clicked position to PlayerUseUnknownEntityEvent (#9604)
PaperMC/Paper@ea1f33c Delete patch to fix PaperMC/Paper#9612 (#9621)
PaperMC/Paper@307d05b Count down radius-aware dependency tree node parents (#9600)
PaperMC/Paper@eb8f2bb Fix unknown entity interaction clicked position getter if null
PaperMC/Paper@fd4f0c7 API for an entity's scoreboard name (#9462)
PaperMC/Paper@2bd6ba2 Deprecate and replace methods using deprecated StructureType (#8643)
PaperMC/Paper@666a214 [ci skip] rebuild patches
PaperMC/Paper@d129162 Properly handle BlockBreakEvent#isDropItems (#8936)
PaperMC/Paper@67a1a8c Fix Inventory#getLocation not working for the composter (#9596)
PaperMC/Paper@5b34a09 Add option to disable chorus plant and mushroom block updates (#9442)
PaperMC/Paper@ed8401c Fix rotation for spawning display entities (#9552)
PaperMC/Paper@bd67b83 Determine lava and water fluid explosion resistance by their block explosion resistance (#9482)
PaperMC/Paper@d928dda Don't tab-complete namespaced commands if `send-namespaced` is false (#9366)
PaperMC/Paper@f43a19c Fix CME in CraftPersistentDataTypeRegistry (#6701)
PaperMC/Paper@45ba652 [ci skip] Rebuild patches
PaperMC/Paper@990765b Fire entity death event for ender dragon (#9495)
PaperMC/Paper@1259b93 Fixed CraftItemStack/CraftItemMeta enchantment level inconsistency (#8792)
PaperMC/Paper@88891c3  Add Entity Coordinate and Rotation API (#9461)
PaperMC/Paper@5bf82aa Add cancellability to PlayerTrackEntityEvent (#8605)
PaperMC/Paper@1b96c64 Improve cancelling PreCreatureSpawnEvent with per player mob spawns (#9400)
PaperMC/Paper@7232506 Add entity tracker min Y distance config option (#9406)
PaperMC/Paper@00a68b1 Player listing API (#8782)
PaperMC/Paper@af6142e [ci skip] Update Gradle wrapper
PaperMC/Paper@281855c Remove unused lag-compensate-block-breaking option (#9635)
PaperMC/Paper@35ef053 [ci skip] update editorconfig and gitattributes (#9608)
PaperMC/Paper@97b9c4a Fix NPE on Boat#getStatus (#9115)
PaperMC/Paper@2be57c6 Expand Pose API (#8781)
PaperMC/Paper@b29ecd4 Expose clicked BlockFace during BlockDamageEvent (#9632)
PaperMC/Paper@e3f29f4 MerchantRecipe: add copy constructor (#8703)
PaperMC/Paper@fed9042 More DragonBattle API (#5655)
PaperMC/Paper@27d39ca Properly clone custom nbt tags inside ItemMeta (#7849)
PaperMC/Paper@0c7385b Add PlayerPickItemEvent (#5590)
PaperMC/Paper@9395aa6 Improve performance of mass crafts (#9603)
PaperMC/Paper@7386a13 Fix endgateway teleportation offset (#9517)
PaperMC/Paper@a712766 Allow custom damage for trident (#8132)
PaperMC/Paper@3716832 Prevent overfilled bundles from duplicating items (#9633)
PaperMC/Paper@9cbad8e Expose Hand during BlockCanBuildEvent (#9636)
PaperMC/Paper@fcc5f23 Optimize nearest structure border iteration (#9638)
PaperMC/Paper@a751001 [ci skip] Refactor context records for easier expansion (#9589)
PaperMC/Paper@7a1863e Limit setBurnTime to valid short values (#9623)
PaperMC/Paper@b8a0049 Fix exact choice recipe book clicks (#7822)
PaperMC/Paper@b45ecc9 [ci skip] clear out test plugin
PaperMC/Paper@0c8882f Add OfflinePlayer#isConnected (#9642)
PaperMC/Paper@e552beb Fix inventory desync (#9640)
PaperMC/Paper@6f30f08 Readd old BlockDamageEvent constructor
PaperMC/Paper@6813244 Fix/improve destroy speed API (#9645)
PaperMC/Paper@7d13b70 Add titleOverride to InventoryOpenEvent (#7540)
PaperMC/Paper@0e622c7 Add sniffer egg api (#9288)
PaperMC/Paper@0c0a480 Do crystal-portal proximity check before entity lookup (#9611)
PaperMC/Paper@b8edb0e Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9648)
PaperMC/Paper@b4e3b3d Allow non-op players to execute the click event callback (#9652)
PaperMC/Paper@39953cf Take in account waterlogged blocks for scaffolding (#9676)
PaperMC/Paper@471f4de Copy NBT in upgrade data neighbor ticks
PaperMC/Paper@33bec7f Copy NBT in legacy dragon fight converter
PaperMC/Paper@72e87ab Strip raytracing for EntityLiving#hasLineOfSight
PaperMC/Paper@e2b1971 Add missing slot sanity checks for container clicks
PaperMC/Paper@c9cd94f Fix fixItemsMergingThroughWalls check (#9707)
PaperMC/Paper@fb06829 Optimise multiple block updates occurring in the same chunk
PaperMC/Paper@517f8fb Fix line of sight distance check
PaperMC/Paper@1c15111 Add missing particle javadocs (#9716)
PaperMC/Paper@eea0c64 Swap some nullable annotations (#9696)
PaperMC/Paper@e68fd71 Add missing Piglin Dancing API (#8894)
PaperMC/Paper@6378792 Add Barrel to LootableBlockInventory (#9687)
PaperMC/Paper@7145f41 compression level change with config option (#9711)
PaperMC/Paper@29d1c7b Call BlockRedstoneEvents for lecterns (#9721)
PaperMC/Paper@eb60bff Create raw chat type as resource file instead of in source (#9226)
PaperMC/Paper@99b311d [ci skip] Clarify where furnace-related events are called (#8753)
PaperMC/Paper@83cfeb1 Improve java version check (#9692)
PaperMC/Paper@deb92c2 Add ItemStack#isEmpty and related methods (#9664)
PaperMC/Paper@0c8e84c Enforce sign line nullability when setting line with Adventure Method (#9689)
PaperMC/Paper@ede9c06 Fix Projectile#setOwner(null) not clearing owner (#9715)
PaperMC/Paper@e312ebb Add DISPLAY tracking range type (#9668)
PaperMC/Paper@06a741d Fix leashed pets teleporting to owner when loaded (#9686)
PaperMC/Paper@064fb50 Cleanup old async commands patch (#8895)
PaperMC/Paper@d8af99a Fix silent equipment change for mobs (#9677)
PaperMC/Paper@3cec9c9 [ci skip] Add missing javadoc links (#9497)
PaperMC/Paper@ba0e1f5 Fix sapling observer detection and grow event (#9654)
PaperMC/Paper@a856073 Fix two beacon bugs (#9675)
PaperMC/Paper@581b683 Fix spigot's Forced-Stats (#9663)
PaperMC/Paper@1b1c230 Add missing InventoryHolders to inventories (#7400)
PaperMC/Paper@3fd1502 Add missing deprecation (#8886)
PaperMC/Paper@773dd72 Updated Upstream (Bukkit/CraftBukkit) (#9739)

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     id("java-library")
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("io.papermc.paperweight.patcher") version "1.5.5"
+    id("io.papermc.paperweight.patcher") version "1.5.7-SNAPSHOT"
 }
 
 repositories {

gradle.properties

@@ -3,7 +3,7 @@ version = 1.20.1-R0.1-SNAPSHOT
 
 mcVersion = 1.20.1
 packageVersion = 1_20_R1
-paperRef = a73ed9572e68f228c97e168be74fb357cf9115bf
+paperRef = 1.20.1
 
 org.gradle.jvmargs = -Xmx2G
 

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

@@ -5,12 +5,12 @@ Subject: [PATCH] Pufferfish api patches
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 149f9088fe806467656e8b1c4157df60fda69ba7..a9ef5d7c9e1fd3b8bb33fdb169ea0d69317f9e79 100644
+index aed834334385ff3038ae69f3f34d129ad2507960..b7324171347c6f277b6b840a002c2d557ae8c82e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -71,6 +71,8 @@ dependencies {
-     testImplementation("junit:junit:4.13.2")
      testImplementation("org.hamcrest:hamcrest-library:1.3")
+     testImplementation("org.mockito:mockito-core:5.5.0")
      testImplementation("org.ow2.asm:asm-tree:9.5")
 +
 +    api("io.sentry:sentry:5.4.0") // Pufferfish

patches/api/0002-Add-CloudPlane-configuration.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add CloudPlane configuration
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 68206cf0178c26c0f528a1e14a5fb4e9ad410369..0cd39064429a17cdcb06cc598df46becdc52996c 100644
+index 8d8fe04e6b09d2a5b1cc05002073df5c58cdcb96..8758095bd8669061561802ba4bf0243d7f3c38c7 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2081,6 +2081,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2121,6 +2121,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
 

patches/server/0002-Change-branding.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Change branding
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2d245d1470c3b1ff9bf3d791d19a82999e7d3efd..ca6eebc3548eec8d821090278bfae27de12f30c6 100644
+index cfbf31d3f992037b2b5319b661f16c1bdcf4a36e..a373a22b17cd7b2ce0db454302f6673adb8197ab 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,8 +13,10 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -105,10 +105,10 @@ index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..b650f1f7390374dd50b0a281441d0ddb
                  org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
              }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3aff94cd3c825125bba334c003aa5c1085a7b4a8..4ab16edd644c1ae02f218debe79ea6201be6d7a5 100644
+index ebd525f15a8b0955b88ea5f30be8f8b3c6590206..fac25947c5eef7b48df4c22ac0929bcb04a87a06 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1695,7 +1695,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1694,7 +1694,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
      @DontObfuscate
      public String getServerModName() {
@@ -118,7 +118,7 @@ index 3aff94cd3c825125bba334c003aa5c1085a7b4a8..4ab16edd644c1ae02f218debe79ea620
 
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cc133e4eec67ec3aed27a4a5df1005e0556a643f..f51abd84df0f1befb4786c3513dfdc12f4ddb82a 100644
+index c69421e2ff9c7686f5f7763779659bc162ab5615..0b0babc211247839107f3e52f7f801f7bb3f9cd3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -265,7 +265,7 @@ import javax.annotation.Nullable; // Paper
@@ -131,10 +131,10 @@ index cc133e4eec67ec3aed27a4a5df1005e0556a643f..f51abd84df0f1befb4786c3513dfdc12
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 776b7fc26fe96b69be260bbd36efae147d988640..c191dffe3de45d66f067220ba7224dab4ed07550 100644
+index 7c29d92362a82330440dff151bcf421f15c68f71..a7f817d770367681c3f4c1a8bde30d6f44d96a9a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -292,7 +292,7 @@ public class Main {
+@@ -300,7 +300,7 @@ public class Main {
                      if (buildDate.before(deadline.getTime())) {
                          // Paper start - This is some stupid bullshit
                          System.err.println("*** Warning, you've not updated in a while! ***");

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

@@ -206,7 +206,7 @@ index 0000000000000000000000000000000000000000..0bba071dd01550b504a435b94fa8ed8b
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 28af96ce4f9f1a83316b6fd9e1625c71b5874c3f..da36db4270f9e97534b7221dbc29b3fcaec8396d 100644
+index 10501842887c1ffdb6bb667480682b7174fd89c6..24a0eaf6742ff832ddafe89c66acaff77944aa05 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -218,6 +218,14 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -225,7 +225,7 @@ index 28af96ce4f9f1a83316b6fd9e1625c71b5874c3f..da36db4270f9e97534b7221dbc29b3fc
          io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
          // Paper end
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 4c7dc6eb008fe4a5d521e40e6ff0798b612700fb..ac84f18bf9cf2251366b7e391bafba743fa4d31e 100644
+index 7b9279a3df58a8ff7db492c35be577d8b50e4071..d20747af5c3ddccbf0bbcdfd7e0c17dd85398e61 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -284,9 +284,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -242,18 +242,18 @@ index 4c7dc6eb008fe4a5d521e40e6ff0798b612700fb..ac84f18bf9cf2251366b7e391bafba74
          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 f51abd84df0f1befb4786c3513dfdc12f4ddb82a..9777fdcf0b0ed284a3eacb74b5deb1627b53ddd8 100644
+index 0b0babc211247839107f3e52f7f801f7bb3f9cd3..1738d6a42025b201a12b8d09aafb5f34396f1af1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1057,6 +1057,7 @@ public final class CraftServer implements Server {
+@@ -1037,6 +1037,7 @@ public final class CraftServer implements Server {
 
          org.spigotmc.SpigotConfig.init((File) 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))
-@@ -2907,6 +2908,13 @@ public final class CraftServer implements Server {
+@@ -2917,6 +2918,13 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
 
@@ -268,7 +268,7 @@ index f51abd84df0f1befb4786c3513dfdc12f4ddb82a..9777fdcf0b0ed284a3eacb74b5deb162
          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 c191dffe3de45d66f067220ba7224dab4ed07550..1815345b756813cd19d80c909664199235086ee6 100644
+index a7f817d770367681c3f4c1a8bde30d6f44d96a9a..b99ad0c7ecd8a57958ae6cd93052458a33701625 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -173,6 +173,14 @@ public class Main {

patches/server/0004-Add-allowPvP-gamerule.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add allowPvP gamerule
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8a1fde50b82a8b0718ae04124c2611b7cff4bcd6..6809bc38b382f1f74abdaedbda84537cbe9f7681 100644
+index 323e0b2a6a6f2abb96e85b7d63876bf97cdf26d9..d583ffdeb3fda0f436eae116051e23675089baae 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1509,7 +1509,7 @@ public class ServerPlayer extends Player {
+@@ -1510,7 +1510,7 @@ public class ServerPlayer extends Player {
 
      @Override
      public boolean isInvulnerableTo(DamageSource damageSource) {

patches/server/0008-Only-broadcast-item-pickup-to-picker-viewers.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Only broadcast item pickup to picker viewers
 Stops people with modified clients from detecting vanished players based on invalid entities in this packet
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 68ac88b150ae5fa5e18958a5e2a83b00a26258ae..c63fb21b40278f8d36e53413e6380d80d230f110 100644
+index d60ae9f8d3afe3e996a66331ee510cfa5841388c..ec5cbbae302ad9abb454dbca50244c279ca729bb 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1331,7 +1331,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1353,7 +1353,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
 
      }
 
@@ -19,7 +19,7 @@ index 68ac88b150ae5fa5e18958a5e2a83b00a26258ae..c63fb21b40278f8d36e53413e6380d80
 
          if (playerchunkmap_entitytracker != null) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4646840234a9147bbe4b44cd2e8d83ffbddede01..82b96142c6db261970b642aaa82b5b54a09d3e8f 100644
+index 1c452fd6d0241c8f0d4a927b629fb122bda59748..88f76c8751c6b4c31dcf67d8a76f1594ad5682e3 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3658,7 +3658,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

patches/server/0013-Fix-non-adventure-components-not-being-translated.patch

@@ -36,10 +36,10 @@ index f2f4575e6ec4f5a90b8f48306b0edfef2e5527f5..5ec4339fde101cbf1380dc7104f6d789
              return asJsonString(((AdventureComponent) component).adventure, locale);
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2c9fc0ac0e41a84cf23b1f11dc3d4eb4ed319947..e5978e27c88341eb9461b1532fdc803282296c40 100644
+index 5105be85ba6a65496714658a9ed4b197861d2239..0d268023415202be1908439aaa0913588d1cc91a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2522,7 +2522,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2524,7 +2524,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                          String s = nbt.getString("CustomName");
 
                          try {

patches/server/0014-Fix-cancelling-spectate-event-not-doing-anything.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix cancelling spectate event not doing anything
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6809bc38b382f1f74abdaedbda84537cbe9f7681..0163decb654acf86a0507e041dd5c6344ea58802 100644
+index d583ffdeb3fda0f436eae116051e23675089baae..d20871961ae66b021eb7af871b21ac933eceb598 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2122,11 +2122,13 @@ public class ServerPlayer extends Player {
+@@ -2128,11 +2128,13 @@ public class ServerPlayer extends Player {
              if (this.camera == this) {
                  com.destroystokyo.paper.event.player.PlayerStopSpectatingEntityEvent playerStopSpectatingEntityEvent = new com.destroystokyo.paper.event.player.PlayerStopSpectatingEntityEvent(this.getBukkitEntity(), entity1.getBukkitEntity());
                  if (!playerStopSpectatingEntityEvent.callEvent()) {

patches/server/0015-Resend-more-data-on-locale-change.patch

@@ -27,10 +27,10 @@ index acc49f66bf34e2507d0ee6fec0a56b11bfc68f46..6ca487aaede00451628ff13615625054
          this.player = owner;
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 670033bf5d72a12e44b76d55c4343de1490e873b..83adabab10c71f26d238625f2fa1d61749dbf322 100644
+index d20871961ae66b021eb7af871b21ac933eceb598..5784d7b1469b304c506c391a1515ab86af5a6553 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -320,6 +320,10 @@ public class ServerPlayer extends Player {
+@@ -321,6 +321,10 @@ public class ServerPlayer extends Player {
          });
      }
 
@@ -41,7 +41,7 @@ index 670033bf5d72a12e44b76d55c4343de1490e873b..83adabab10c71f26d238625f2fa1d617
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
          this.chatVisibility = ChatVisiblity.FULL;
-@@ -2037,15 +2041,45 @@ public class ServerPlayer extends Player {
+@@ -2043,15 +2047,45 @@ public class ServerPlayer extends Player {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
              this.server.server.getPluginManager().callEvent(event);
          }
@@ -103,7 +103,7 @@ index 2a5a4027e5d0d9d48a727834f3f5af65ea83aa23..ecef4ec4f67da8fdddd473733000b000
          public static final EntityDataAccessor<Integer> DATA_BACKGROUND_COLOR_ID = SynchedEntityData.defineId(Display.TextDisplay.class, EntityDataSerializers.INT);
          private static final EntityDataAccessor<Byte> DATA_TEXT_OPACITY_ID = SynchedEntityData.defineId(Display.TextDisplay.class, EntityDataSerializers.BYTE);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e1aa3b24019eace573603647a5efbf01f316e4ee..e7dbb9f0c44a5b68274aca7210783ae2a39c541e 100644
+index 0d268023415202be1908439aaa0913588d1cc91a..befe870f0a6b9136e5d2d74b2a30c2e465a26290 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -355,7 +355,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

scripts/upstreamCommit.sh

@@ -44,7 +44,7 @@ logsuffix=""
 
 # Paper updates
 if [ -n "$paperHash" ]; then
-    newHash=$(git diff gradle.properties | awk '/^+paperCommit =/{print $NF}')
+    newHash=$(git diff gradle.properties | awk '/^+paperRef =/{print $NF}')
     paper=$(getCommits "PaperMC/Paper" "$paperHash" $(echo $newHash | grep . -q && echo $newHash || echo "HEAD"))
 
     # Updates found

settings.gradle.kts

@@ -2,6 +2,13 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         maven("https://repo.papermc.io/repository/maven-public/")
+
+        // temporary until new version with fork-fix is released
+        maven("https://repo.papermc.io/repository/maven-snapshots/") {
+            content {
+                includeGroupByRegex("io.papermc.paperweight.*")
+            }
+        }
     }
 }