Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@75655ec Add Configuration for vertical Despawn Ranges (#11279)
PaperMC/Paper@0e73617 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11284)
PaperMC/Paper@66a97cc Update item data sanitization (#11227)
PaperMC/Paper@2e82fd2 Add even more Enchantment API (#11115)
PaperMC/Paper@57dd822 Leashable API (#10961)
PaperMC/Paper@8c3018a Fix Selector Arguments not working with permission (#11286)
PaperMC/Paper@4401748 Fix CraftBukkit drag system (#10703)
PaperMC/Paper@64c9ee6 Allow getting/setting the sign's editor uuid (#10637)

Author: granny

gradle.properties

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21.1-R0.1-SNAPSHOT
 
 mcVersion = 1.21.1
-paperCommit = 52ae4ad4666b34d637f2de573ed03c02b0fc6a24
+paperCommit = 64c9ee6584ce15e5b486bdc7183fe902e22fddf3
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/server/0001-Pufferfish-Server-Changes.patch

@@ -1413,7 +1413,7 @@ index 2fe9d9b38c01d04416843fdd48d3e33899b7de63..5a9712de8abe3c3ccd08c5699f89e3ce
 
              if (this.isRainingAt(blockposition)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 750f216400a473ed6895273c99ff89960bb56833..3d1dc6d712f61de2a4927b3bf2973f75af24cf11 100644
+index 238114d295df0508be6b47b94f478b9906384be0..879cec7a0c8e519c3c192c03be34f0012ec21790 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1157,6 +1157,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -1634,7 +1634,7 @@ index ccd9dff20a60f019e0c320acfb526b8bf3e5f806..ce0d28cafcae0b7edc861749a1652ecc
          if (this.isSpectator()) {
              return false;
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index bd7c6ce15698aed70376c109ba36f52d6794a2f8..7c207bd1da82255bf504f9212c08201fe9389f1a 100644
+index f36a814bfd90af6457171512c131601b19905737..16fbbfd47c494d9fdea844cdb767dd9f6fe5e171 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -232,14 +232,16 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -1656,7 +1656,7 @@ index bd7c6ce15698aed70376c109ba36f52d6794a2f8..7c207bd1da82255bf504f9212c08201f
              this.targetSelector.tick();
          }
      }
-@@ -925,16 +927,20 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -932,16 +934,20 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
 
          if (i % 2 != 0 && this.tickCount > 1) {
              gameprofilerfiller.push("targetSelector");

patches/server/0009-Ridables.patch

@@ -66,7 +66,7 @@ index ffc7f4f4544df21b713b780eded8aeba4090db52..6cad742f0141ac0e4b4b5a1dd07874eb
 
      private void updatePlayerAttributes() {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3d1dc6d712f61de2a4927b3bf2973f75af24cf11..b958bfbe87b559417ec6241c14a91e09e0b583d4 100644
+index 879cec7a0c8e519c3c192c03be34f0012ec21790..fad9abfa335c84cb0afca429eb052e57eca7ed4f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2785,6 +2785,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -259,7 +259,7 @@ index ce0d28cafcae0b7edc861749a1652ecc08d298b5..e7b9f129a31c57df65e9be082de1d2f3
          // Paper end - Add EntityMoveEvent
          if (!this.level().isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 7c207bd1da82255bf504f9212c08201fe9389f1a..9010da67e2a20c58195d8a49244d6850468fb153 100644
+index 16fbbfd47c494d9fdea844cdb767dd9f6fe5e171..b45cefa0455ee5634b0b719bf93f7ab728d63eb0 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -160,8 +160,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -273,7 +273,7 @@ index 7c207bd1da82255bf504f9212c08201fe9389f1a..9010da67e2a20c58195d8a49244d6850
          this.jumpControl = new JumpControl(this);
          this.bodyRotationControl = this.createBodyControl();
          this.navigation = this.createNavigation(world);
-@@ -1510,7 +1510,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1517,7 +1517,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
      protected void onOffspringSpawnedFromEgg(Player player, Mob child) {}
 
      protected InteractionResult mobInteract(Player player, InteractionHand hand) {
@@ -282,7 +282,7 @@ index 7c207bd1da82255bf504f9212c08201fe9389f1a..9010da67e2a20c58195d8a49244d6850
      }
 
      public boolean isWithinRestriction() {
-@@ -1808,4 +1808,56 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1815,4 +1815,56 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
 
          return itemmonsteregg == null ? null : new ItemStack(itemmonsteregg);
      }
@@ -5122,10 +5122,10 @@ index cd789c235acf740ec29c30b180e7fbe1a140caa9..edaaaf0ecc412504b32fe7481f95e594
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 8dd85b9ca3b3e3429de4d0ec0654982589c6e93e..8c1fdda7c30c12bc5262d373474deb6930e811e8 100644
+index 77ef27f9254235180a8596c6c8c4af750dc759d1..220e663d7b1e134845e8d9b52ae104b77fb29c46 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -601,6 +601,15 @@ public class CraftEventFactory {
+@@ -603,6 +603,15 @@ public class CraftEventFactory {
          // Paper end
          craftServer.getPluginManager().callEvent(event);
 
@@ -5141,7 +5141,7 @@ index 8dd85b9ca3b3e3429de4d0ec0654982589c6e93e..8c1fdda7c30c12bc5262d373474deb69
          return event;
      }
 
-@@ -1191,6 +1200,7 @@ public class CraftEventFactory {
+@@ -1193,6 +1202,7 @@ public class CraftEventFactory {
          EntityDamageEvent event;
          if (damager != null) {
              event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, bukkitDamageSource, modifiers, modifierFunctions, critical);

patches/server/0072-Entity-lifespan.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entity lifespan
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index efaa369dc1a01e4e40bec8a6a5562e7c1822b1ac..1121011d188db81be723e12fa734c3659d993176 100644
+index dffb1f179e4b0526fc7223c8c6a356ce32ed6448..1d49dc7fa0bed6a001ea29c051025b3b24d13c04 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2820,6 +2820,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -17,7 +17,7 @@ index efaa369dc1a01e4e40bec8a6a5562e7c1822b1ac..1121011d188db81be723e12fa734c365
                      private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit
                          ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand);
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 9010da67e2a20c58195d8a49244d6850468fb153..3e148325f6fa9772134d2954abc39de6a5634e34 100644
+index b45cefa0455ee5634b0b719bf93f7ab728d63eb0..349e9121d72f572e3e54e98aea50489f02fa4522 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -146,6 +146,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -85,7 +85,7 @@ index 9010da67e2a20c58195d8a49244d6850468fb153..3e148325f6fa9772134d2954abc39de6
      }
 
      @Override
-@@ -1749,6 +1777,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1756,6 +1784,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
              this.playAttackSound();
          }
 

patches/server/0105-Changeable-Mob-Left-Handed-Chance.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Changeable Mob Left Handed Chance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 3e148325f6fa9772134d2954abc39de6a5634e34..eff98dd7a048c107420fe6fa76179592937cdf1d 100644
+index 349e9121d72f572e3e54e98aea50489f02fa4522..175da1a128f9b53c6d61e936a18299a9fa2b9c29 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1437,7 +1437,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1444,7 +1444,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
              attributemodifiable.addPermanentModifier(new AttributeModifier(Mob.RANDOM_SPAWN_BONUS_ID, randomsource.triangle(0.0D, 0.11485000000000001D), AttributeModifier.Operation.ADD_MULTIPLIED_BASE));
          }
 

patches/server/0169-API-for-any-mob-to-burn-daylight.patch

@@ -33,7 +33,7 @@ index cc4bb21903a44a7a06176274bfdaddd3626f78c7..543fc2aeee9fa16a5493b947e49d37ff
          this.id = Entity.ENTITY_COUNTER.incrementAndGet();
          this.passengers = ImmutableList.of();
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0b488f45c7f259ced70004909077bc5a15191580..19dc529bef0cf9a9accb8a8615f5eeb22663d605 100644
+index 3c7331f3e5fa62e880a09a5d37c4bf041a8ae943..1602b6f4bc7766b3316e68287bbf549b195cb09d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -285,6 +285,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -100,10 +100,10 @@ index 0b488f45c7f259ced70004909077bc5a15191580..19dc529bef0cf9a9accb8a8615f5eeb2
 
      public boolean isSensitiveToWater() {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 86ae2cb0e398f4e85c90ca5b20dce8eacde7d71f..377f4311de40d702c53b0641376e6b2bddf33028 100644
+index 5b082de9dc36eeb6d4432d00803880983b2dac5d..3150041b72d3a4fe01a0ca6f2ddb3003f4edfff4 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1784,17 +1784,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1791,17 +1791,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
      protected void playAttackSound() {}
 
      public boolean isSunBurnTick() {
@@ -375,10 +375,10 @@ index 0d497b26eeb53ca65bbb936e2c1bed3d47560ea2..33469665998543f45e68eb50e7dc3f3c
          Preconditions.checkArgument(entity != null, "Unknown entity");
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index d2bb0831394c03b620b2cbd8306cb82b621f34f7..572587db064c87ac86add6d9eece5ac94374c7b9 100644
+index beb6ad312028adb14053e3f019a4fcf6c9149373..9df7793b458527c9b8cd8dce9bddfd52bb8bb744 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1189,4 +1189,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1163,4 +1163,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return this.getHandle().canUseSlot(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
      }
      // Paper end - Expose canUseSlot

patches/server/0243-Stonecutter-damage.patch

@@ -115,10 +115,10 @@ index 31ae0f466ae522d767907ec5066b26695f327b96..f26383cf896785333dbd6f86348d5a5f
          } else if (blockState.is(Blocks.HONEY_BLOCK)) {
              return PathType.STICKY_HONEY;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 8c1fdda7c30c12bc5262d373474deb6930e811e8..198a86fc9b8c4dba8c8de27bccc4de65690b84de 100644
+index 220e663d7b1e134845e8d9b52ae104b77fb29c46..3c533df90cf8b1a69b190ffee06c9254e4e4d764 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1140,7 +1140,7 @@ public class CraftEventFactory {
+@@ -1142,7 +1142,7 @@ public class CraftEventFactory {
              return CraftEventFactory.callEntityDamageEvent(source.getDirectBlock(), source.getDirectBlockState(), entity, DamageCause.LAVA, bukkitDamageSource, modifiers, modifierFunctions, cancelled);
          } else if (source.getDirectBlock() != null) {
              DamageCause cause;

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

@@ -1289,7 +1289,7 @@ index 273ba284ef4f515ac7ca276264e17e04cdbe5b2e..943b4e93d1cfbb6b5d933851b2494fb6
          // Purpur start
          if (this.xo != this.getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 377f4311de40d702c53b0641376e6b2bddf33028..ff3d098d57d13d79d303e252874350e4b9ce161e 100644
+index 3150041b72d3a4fe01a0ca6f2ddb3003f4edfff4..f17127b92115ed08ad5936d0be10ab8dd5b9bffb 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -370,13 +370,13 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -1326,7 +1326,7 @@ index 377f4311de40d702c53b0641376e6b2bddf33028..ff3d098d57d13d79d303e252874350e4
      }
 
      protected Vec3i getPickupReach() {
-@@ -946,48 +946,48 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -953,48 +953,48 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
              return;
          }
          // Paper end - Allow nerfed mobs to jump and float