Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@862299b "Downgrade" Vineflower to 1.10.1 release (#10423)
PaperMC/Paper@9e886c4 Remove dead code (LegacyResult) (#10411)
PaperMC/Paper@3b078f8 Add API for ticking fluids (#10435)
PaperMC/Paper@908b814 Fix inventory desync with PlayerLeashEntityEvent (#10436)
PaperMC/Paper@3af1346 Allow setting player list name early
PaperMC/Paper@a033033 Added chunk view API (#10398)
PaperMC/Paper@c5f68ff Add CartographyItemEvent and get/setResult for CartographyInventory (#10396)
PaperMC/Paper@fc53ff5 Add Configuration for finding Structures outside World Border (#10437)
PaperMC/Paper@a6b6ecd More Raid API (#7537)

patches/server/0008-Ridables.patch

@@ -22,7 +22,7 @@ index 70f9e737b3b9f80395afc3542aafe4a0c774c722..70fa9893c7af6387df9e5c33be21653e
          super(x, y, z);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0405c868facdbe64537ef6be4d65e80cea929af0..276ecc5e497f92be0df386fc594311e630018191 100644
+index 9094dacbdac148062f9f600556fe6588a6ae75f9..4dc2e55fb12c184b0fb8fe1e638f0e082b201192 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1712,6 +1712,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -66,7 +66,7 @@ index e10999f90a695ac8399f1089aae6b8c0a225f5da..afca9734927fd003e249972439494c56
  
      public void doTick() {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2ae1d53364da7f0e30c642df4e9a62f9e6581432..d9f24bcc2f5eaabc49f6a9ec545afe2d096fc532 100644
+index e725c1c0496383007ffb94c46fc18340666b5e29..ccf2ab27e73903ee4ae5e60838d694ed4ccad79c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2722,6 +2722,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -268,7 +268,7 @@ index 366121188c5abb550ed0a5f99d25c001628685bb..98907fee8d85e7b7dc66807a0717134d
          // 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 4cf2963fdbe9003fd18ac8c2035ccded57c02abd..8b39ea90558dbd5356c038b74fa4037fb69546ac 100644
+index a6b48b4eab6e0e98205fd9cafc3cde5ad39651af..6b8b1f391dac79e9ce3229684e4d198787b92776 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -149,8 +149,8 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -282,7 +282,7 @@ index 4cf2963fdbe9003fd18ac8c2035ccded57c02abd..8b39ea90558dbd5356c038b74fa4037f
          this.jumpControl = new JumpControl(this);
          this.bodyRotationControl = this.createBodyControl();
          this.navigation = this.createNavigation(world);
-@@ -1398,7 +1398,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1399,7 +1399,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
      protected void onOffspringSpawnedFromEgg(Player player, Mob child) {}
  
      protected InteractionResult mobInteract(Player player, InteractionHand hand) {
@@ -291,7 +291,7 @@ index 4cf2963fdbe9003fd18ac8c2035ccded57c02abd..8b39ea90558dbd5356c038b74fa4037f
      }
  
      public boolean isWithinRestriction() {
-@@ -1787,4 +1787,56 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1788,4 +1788,56 @@ public abstract class Mob extends LivingEntity implements Targeting {
  
          return itemmonsteregg == null ? null : new ItemStack(itemmonsteregg);
      }
@@ -398,7 +398,7 @@ index c92583b6d1527db32f4a644f30c8f8468e9e2fc2..b8f65dc8f0db4bbe5f9c223e4ba12973
          .put(EntityType.PIGLIN, Piglin.createAttributes().build())
          .put(EntityType.PIGLIN_BRUTE, PiglinBrute.createAttributes().build())
 diff --git a/src/main/java/net/minecraft/world/entity/ai/control/MoveControl.java b/src/main/java/net/minecraft/world/entity/ai/control/MoveControl.java
-index b70295a746b6993f1da0f8669567cd6a955573a6..c3049e6c623949b19fde04a3db8ff057a6d07955 100644
+index ca02566b20dd52a59bc7b150529a1d68bc560ab0..10265fd19c90cea34372a786bb272dbcdd91b993 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/control/MoveControl.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/control/MoveControl.java
 @@ -29,6 +29,20 @@ public class MoveControl implements Control {
@@ -423,7 +423,7 @@ index b70295a746b6993f1da0f8669567cd6a955573a6..c3049e6c623949b19fde04a3db8ff057
          return this.operation == MoveControl.Operation.MOVE_TO;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/ai/control/SmoothSwimmingLookControl.java b/src/main/java/net/minecraft/world/entity/ai/control/SmoothSwimmingLookControl.java
-index fcb419bc334207216e7cec103fd3a0ac447a0ebe..b33da623d6537ff35930667272f45dcc9090502d 100644
+index fbfc2f2515ad709b2c1212aef9521e795547d66b..e77bd11af62682d5eca41f6c9e1aed30eb6879ce 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/control/SmoothSwimmingLookControl.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/control/SmoothSwimmingLookControl.java
 @@ -3,7 +3,7 @@ package net.minecraft.world.entity.ai.control;
@@ -541,7 +541,7 @@ index 4fba7c2f6ec363846a772ef2a63e9b3fc1037de5..f8c2e2a7065a3ad5b306ebab3d04a12f
          BlockPos blockposition = this.blockPosition();
          BlockPos blockposition1 = blockposition.above();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java b/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
-index 9d67c2394be00ed226a3076a3f01ba70423fc29c..b1df01bfc16f548821576c93f9616169314f89d7 100644
+index 401cffccd3c6adedcbd3986cd13733772953b31b..b8f973505b184cf198b6782a6f423c921c3881a7 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/AbstractFish.java
 @@ -94,6 +94,7 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
@@ -561,7 +561,7 @@ index 9d67c2394be00ed226a3076a3f01ba70423fc29c..b1df01bfc16f548821576c93f9616169
              this.move(MoverType.SELF, this.getDeltaMovement());
              this.setDeltaMovement(this.getDeltaMovement().scale(0.9));
              if (this.getTarget() == null) {
-@@ -167,7 +168,7 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
+@@ -168,7 +169,7 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
      protected void playStepSound(BlockPos pos, BlockState state) {
      }
  
@@ -570,7 +570,7 @@ index 9d67c2394be00ed226a3076a3f01ba70423fc29c..b1df01bfc16f548821576c93f9616169
          private final AbstractFish fish;
  
          FishMoveControl(AbstractFish owner) {
-@@ -175,14 +176,22 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
+@@ -176,14 +177,22 @@ public abstract class AbstractFish extends WaterAnimal implements Bucketable {
              this.fish = owner;
          }
  
@@ -1476,7 +1476,7 @@ index 24770540c51fe4831040d6b46b27636d25ebac40..ebfa162f172bdad7b17ce153fdee5087
          this.goalSelector.addGoal(3, new BreedGoal(this, 1.0D));
          this.goalSelector.addGoal(4, new TemptGoal(this, 1.2D, Ingredient.of(Items.CARROT_ON_A_STICK), false));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-index 17749ddf448ea4f04ed1e1a9c33123e1cd49a46e..c737eea79621d565b5bbd28e22fa0731c3ed6068 100644
+index c9e10d4ce00b711b30de5d346a5ac26e7b441390..a1195a7465883b944bd12a793701e4774944be68 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 @@ -59,11 +59,40 @@ public class PolarBear extends Animal implements NeutralMob {
@@ -1830,7 +1830,7 @@ index 9eab1170cb123d3b60a02314702516704f959ab7..c48ceed671e1804756d8a11208e5f7e5
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-index 051fb9f1e0d91b1cb1e2dec9a03f3b26fe64c82a..423c67f6d0faac7e46bdbe7f5bc3076a687fbb73 100644
+index 36506dc4b99f9de19a23a99c1bccdcb4e7102e72..7b6e1f5a44a5a690dca97693bb053d3186ff1b69 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
 @@ -48,9 +48,32 @@ public class Squid extends WaterAnimal {
@@ -1905,7 +1905,7 @@ index 051fb9f1e0d91b1cb1e2dec9a03f3b26fe64c82a..423c67f6d0faac7e46bdbe7f5bc3076a
              if (i > 100) {
                  this.squid.setMovementVector(0.0F, 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
-index 5247f1134db2cbaf412cfe583b67cfe4d58dc967..fe546baadc2e238667386c494359ddf904dd41e5 100644
+index 6e9e86b6d547d7437c990b65718b95ad0d60f020..3ec6caf965c9a69eb56e507e2c452129064d3c68 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 @@ -65,6 +65,18 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
@@ -2446,7 +2446,7 @@ index 8c14f9f2ad383f87c498126f135b460a241da410..5242059484fb5f407a2da2b0c01a8fee
      protected SoundEvent getAmbientSound() {
          return SoundEvents.DONKEY_AMBIENT;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
-index f3ba42437e50cd19ad12d00a39c3f92544137fbd..6503f68345d931ac73e8291add6ed108c10ceb60 100644
+index 2181d74ad955197eb4f1925a64914a6197fa9023..5efed70522657c2a02f869affc6755332082cf97 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
 @@ -40,6 +40,13 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
@@ -2462,7 +2462,7 @@ index f3ba42437e50cd19ad12d00a39c3f92544137fbd..6503f68345d931ac73e8291add6ed108
 +
      @Override
      protected void randomizeAttributes(RandomSource random) {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(generateMaxHealth(random::nextInt));
+         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 index 6623674136b0f865d5b3d7a10d3bf05793b82f87..1c6be506804b9622c4d0094814939f894ca857df 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
@@ -3056,7 +3056,7 @@ index 586e3e92ccc275446df6dbbff9bf010a37a9aa8f..9d259d7e2aa3e44e350eb5927314cfce
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Blaze.java b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
-index 2d4399a4dba754704c873f088fb4fc1a7fc56ef1..929074db505e0838a9b133228f81cad87bdab5fb 100644
+index 58c2b8b8bfd5a40259aa6252243884d14c183ef2..b48bb11029e2726cde2e8f624b8c1ad159740e3a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Blaze.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
 @@ -32,6 +32,7 @@ public class Blaze extends Monster {
@@ -3779,7 +3779,7 @@ index fb84b35e34063075e69e00e430bc00e7c3b9d62c..4d50d10016a3b574d67bdfec5aee910c
          this.targetSelector.addGoal(2, (new NearestAttackableTargetGoal<>(this, Player.class, true)).setUnseenMemoryTicks(300));
          this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false)).setUnseenMemoryTicks(300));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
-index 2ae1e5d2b16322136983d6703b770bfc3602b6eb..6c4422adf858595a740f6f8758db18859dc33004 100644
+index c4b4ff79bfdf9e34bf73a7760369e24b28dbbd70..b60e01a6cfce467f2e0a95a52f5ad7379d9fe574 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
 @@ -25,6 +25,28 @@ public class MagmaCube extends Slime {
@@ -3818,8 +3818,8 @@ index 2ae1e5d2b16322136983d6703b770bfc3602b6eb..6c4422adf858595a740f6f8758db1885
 -    protected void jumpFromGround() {
 +    public void jumpFromGround() { // Purpur - protected -> public
          Vec3 vec3 = this.getDeltaMovement();
-         float f = this.getSize() * 0.1F;
-         this.setDeltaMovement(vec3.x, this.getJumpPower() + f, vec3.z);
+         float f = (float)this.getSize() * 0.1F;
+         this.setDeltaMovement(vec3.x, (double)(this.getJumpPower() + f), vec3.z);
          this.hasImpulse = true;
 +        this.actualJump = false; // Purpur
      }