Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@77c763b Fix PlayerShearBlockEvent drops ignored for Pumpkin (#10956)
PaperMC/Paper@76c2f16 Fix wrong diff applying delta twice (#10959)

gradle.properties

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21-R0.1-SNAPSHOT
 
 mcVersion = 1.21
-paperCommit = 19105a9019d7e67fac176dd9b9709cd25c213d31
+paperCommit = 76c2f16f577d2e5515482a8dcd3d97aeeec20e1e
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/server/0005-Component-related-conveniences.patch

@@ -81,10 +81,10 @@ index bb1a60180e58c1333e7bb33e8acf1b0225eda8a8..c83e80ebdbbfb2d0e08561a44486a308
          return this.type().msgId();
      }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 437956b18d5bffd93c46e0be34cf413e9c704e5a..9e5eda675411916f40a82d7c60e488cf790381e3 100644
+index 1a40128b06e70e39a82f170fc16dcae1e22c745c..43a42cc5fc6739f3e0a15ac233b96efd4604b382 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4015,6 +4015,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4014,6 +4014,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return SlotAccess.NULL;
      }
 

patches/server/0006-Ridables.patch

@@ -79,7 +79,7 @@ index 7796e191747be545e744564a2b0b65790f69114d..82f60de72bc0f9b01eb97dbc0e296e80
                              if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
                                  entity.resendPossiblyDesyncedEntityData(ServerGamePacketListenerImpl.this.player); // Paper - The entire mob gets deleted, so resend it
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9e5eda675411916f40a82d7c60e488cf790381e3..f332458dbc26bb0e77ca9b7446f4ae800c359d13 100644
+index 43a42cc5fc6739f3e0a15ac233b96efd4604b382..0fede48747fcc4c0674f25feec7a4173292c2fe6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -383,7 +383,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -91,7 +91,7 @@ index 9e5eda675411916f40a82d7c60e488cf790381e3..f332458dbc26bb0e77ca9b7446f4ae80
      private float eyeHeight;
      public boolean isInPowderSnow;
      public boolean wasInPowderSnow;
-@@ -2964,6 +2964,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2963,6 +2963,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  this.passengers = ImmutableList.copyOf(list);
              }
 
@@ -105,7 +105,7 @@ index 9e5eda675411916f40a82d7c60e488cf790381e3..f332458dbc26bb0e77ca9b7446f4ae80
              this.gameEvent(GameEvent.ENTITY_MOUNT, passenger);
          }
      }
-@@ -3003,6 +3010,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3002,6 +3009,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  return false;
              }
              // CraftBukkit end
@@ -120,7 +120,7 @@ index 9e5eda675411916f40a82d7c60e488cf790381e3..f332458dbc26bb0e77ca9b7446f4ae80
              if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
                  this.passengers = ImmutableList.of();
              } else {
-@@ -4834,4 +4849,44 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4833,4 +4848,44 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
      // Paper end - Expose entity id counter
@@ -5025,7 +5025,7 @@ index 0af34e0f9c9696fbcb11b12fb27472ef17ad532a..d514faecb9e6b244aa043383fa072316
                  this.openTradingScreen(player, this.getDisplayName(), 1);
              }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 0526f4c701b4d945f26c5f382e9efac86cc568fa..0f7c4e39d5569c8f6387bc003d29d4b7d59d77e0 100644
+index 3f397423f023deaf4d8545201088b23ee3cc1cdd..16e7959eb8a87b110e0cfe731a5055af765fad6a 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -207,6 +207,19 @@ public abstract class Player extends LivingEntity {

patches/server/0030-Add-option-to-set-armorstand-step-height.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to set armorstand step height
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6ff9e8bb038e7e1b89796a2e9d271371052ccf22..66f971c14efe9ecac26e84d031334f9bdeb87095 100644
+index efad2c4b8d98aa16f92e46af9300989d883a170d..fee22c6de2faf2dbfb7472fe734a148679f5d026 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -343,6 +343,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -16,7 +16,7 @@ index 6ff9e8bb038e7e1b89796a2e9d271371052ccf22..66f971c14efe9ecac26e84d031334f9b
      public boolean noPhysics;
      public final RandomSource random;
      public int tickCount;
-@@ -4657,7 +4658,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4656,7 +4657,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
 
      public float maxUpStep() {
@@ -38,7 +38,7 @@ index 2f398750bfee5758ad8b1367b6fc14364e4de776..9e6e29b9eddc94b50a32713e8ba1a53d
          if (!this.canTick) {
              if (this.noTickPoseDirty) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3767c19bf0000658acba4632d141525304e5f10e..e9bbf88edaf3f1f3bce0503a3ba34e5b0d84acca 100644
+index 6d3b41da6210699869839826e037a038a637c4c3..e5c4ca83392f398e24be193a0ed77daa85db9913 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -91,6 +91,11 @@ public class PurpurWorldConfig {

patches/server/0047-Allow-leashing-villagers.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow leashing villagers
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 66f971c14efe9ecac26e84d031334f9bdeb87095..5d910738b610041487fc63f1657b827c4ca03107 100644
+index fee22c6de2faf2dbfb7472fe734a148679f5d026..495f6774d64ee885424e6d069f405bcb92e46742 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2762,6 +2762,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2761,6 +2761,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          if (this.isAlive() && this instanceof Leashable leashable) {
              if (leashable.getLeashHolder() == player) {
                  if (!this.level().isClientSide()) {

patches/server/0081-Stop-squids-floating-on-top-of-water.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a90bee7735b4b12371a28e57c6cc4ab88e0c9f9c..f23e932e86a92a796e56d1e994d3d631ad39c8ff 100644
+index ba2048cf57dbceff5a0e8deaa223732d7c127347..45cbba76d55e6d317731fa1e46738ee1823c8775 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4319,6 +4319,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4318,6 +4318,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return Mth.lerp(delta, this.yRotO, this.yRot);
      }
 

patches/server/0120-Fix-stuck-in-portals.patch

@@ -17,10 +17,10 @@ index a1ef38422631b3856160e054daa14eacb8f13c57..794f5ccc2147ad101e06576a704bb153
                  this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
                  this.connection.resetPosition();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 295acb77be8a2219e1f6cfe6e215695d763cfbd9..3e9bb7916e6440b3831871e2b8bcffbfc9172562 100644
+index 187f5a29cd6c2ee3d4e999fca78b8fa436605065..f80133ad16b65f99144c1a721885cffc6254e45f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3103,13 +3103,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3102,13 +3102,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return Vec3.directionFromRotation(this.getRotationVector());
      }
 
@@ -38,7 +38,7 @@ index 295acb77be8a2219e1f6cfe6e215695d763cfbd9..3e9bb7916e6440b3831871e2b8bcffbf
                  this.portalProcess = new PortalProcessor(portal, pos.immutable());
              }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 43ed2d8376784a7b674d6ec3716399a7c04fd1bb..3b351c6fcd59245a3a884c25b5af4ae2aec88610 100644
+index a3f9c6fb8dab3152cafd0ba29a0c398e9bb52327..6499bd31e160fe349007051eaad712d222e7787c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -324,6 +324,7 @@ public class PurpurWorldConfig {

patches/server/0139-Drowning-Settings.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Drowning Settings
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3e9bb7916e6440b3831871e2b8bcffbfc9172562..62a3086a980685c8210bb6b3ec987ce125a99116 100644
+index f80133ad16b65f99144c1a721885cffc6254e45f..555d0b747cc767a3d997b10e5ce8c2a00f261f43 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3322,7 +3322,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3321,7 +3321,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
 
      public int getMaxAirSupply() {
@@ -40,7 +40,7 @@ index d76e8cf2a2d48548b0ad33c78dbf435b61bf91c4..da28941d9a374be39cf7c1620f48ddaa
                  }
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e8aad70484f3cde27fab3ad8abd1ad6b9d524648..947d46dcf7833ea0d2398551114af22cc4241ad4 100644
+index b359af74ec6dee1fdfe7dbcfeeafccf35c5d45c2..1a4d5552d2c5e0080663dba95a3676b766bac5f8 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -163,6 +163,15 @@ public class PurpurWorldConfig {

patches/server/0251-Remove-Mojang-Profiler.patch

@@ -1078,7 +1078,7 @@ index a715ecf4a8ac91d3e5e5c6269d89e54b2c1cd279..223c3665126c576eddb1a8f7c9f5bc60
              };
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 496551820d0357da9c5e89dd989d31b43fbfeb18..99c01f0328fab0a71a888dd57c74e9771e9e6bb8 100644
+index 5c0157a5f54e9de21398ccb3421850b356d1751e..541fbd5b90cc6a2dd98733bc90602256d2ef59ed 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -859,7 +859,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1146,7 +1146,7 @@ index 496551820d0357da9c5e89dd989d31b43fbfeb18..99c01f0328fab0a71a888dd57c74e977
              }
          }
      }
-@@ -3143,7 +3143,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3142,7 +3142,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              this.processPortalCooldown();
              if (this.portalProcess != null) {
                  if (this.portalProcess.processPortalTeleportation(worldserver, this, this.canUsePortal(false))) {
@@ -1155,7 +1155,7 @@ index 496551820d0357da9c5e89dd989d31b43fbfeb18..99c01f0328fab0a71a888dd57c74e977
                      this.setPortalCooldown();
                      DimensionTransition dimensiontransition = this.portalProcess.getPortalDestination(worldserver, this);
 
-@@ -3155,7 +3155,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3154,7 +3154,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                          }
                      }
 
@@ -1164,7 +1164,7 @@ index 496551820d0357da9c5e89dd989d31b43fbfeb18..99c01f0328fab0a71a888dd57c74e977
                  } else if (this.portalProcess.hasExpired()) {
                      this.portalProcess = null;
                  }
-@@ -3656,7 +3656,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3655,7 +3655,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                      }
                  }
 
@@ -1173,7 +1173,7 @@ index 496551820d0357da9c5e89dd989d31b43fbfeb18..99c01f0328fab0a71a888dd57c74e977
                  Entity entity2 = worldserver1.dimension() == worldserver.dimension() ? this : this.getType().create(worldserver1);
 
                  if (entity2 != null) {
-@@ -3692,7 +3692,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3691,7 +3691,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                      teleportTarget.postDimensionTransition().onTransition(entity2);
                  }
 

patches/server/0267-Fire-Immunity-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fire Immunity API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 99c01f0328fab0a71a888dd57c74e9771e9e6bb8..9d44ca469e658005b5379eb07c483fc4983b3273 100644
+index 541fbd5b90cc6a2dd98733bc90602256d2ef59ed..58afe42685536bed08b24ddcf11404b5a4d6c7cd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -430,6 +430,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -25,7 +25,7 @@ index 99c01f0328fab0a71a888dd57c74e9771e9e6bb8..9d44ca469e658005b5379eb07c483fc4
      }
 
      public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {
-@@ -2475,6 +2476,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2474,6 +2475,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  nbttagcompound.putBoolean("Paper.FreezeLock", true);
              }
              // Paper end
@@ -37,7 +37,7 @@ index 99c01f0328fab0a71a888dd57c74e9771e9e6bb8..9d44ca469e658005b5379eb07c483fc4
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
-@@ -2622,6 +2628,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2621,6 +2627,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  freezeLocked = nbt.getBoolean("Paper.FreezeLock");
              }
              // Paper end