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/0009-Configurable-entity-base-attributes.patch

@@ -299,7 +299,7 @@ index ebfa162f172bdad7b17ce153fdee508748620fc0..fdf5651c7877313437ecd32914823d00
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 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 c737eea79621d565b5bbd28e22fa0731c3ed6068..5e6941abe1372ea4cba893de36ab20d2a3a42a21 100644
+index a1195a7465883b944bd12a793701e4774944be68..a681042dac350be5f5828508a7eefbc473376a94 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 @@ -93,6 +93,11 @@ public class PolarBear extends Animal implements NeutralMob {
@@ -395,7 +395,7 @@ index c48ceed671e1804756d8a11208e5f7e5094a4bb1..35392365838bd412255777d1a53bc058
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
 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 423c67f6d0faac7e46bdbe7f5bc3076a687fbb73..43bd8c55368d0bb1dca3a16ea4e0b1d6452be0cd 100644
+index 7b6e1f5a44a5a690dca97693bb053d3186ff1b69..9f598ff84b836d10e215c7e8fe79735f7f41e32b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
 @@ -70,6 +70,11 @@ public class Squid extends WaterAnimal {
@@ -411,7 +411,7 @@ index 423c67f6d0faac7e46bdbe7f5bc3076a687fbb73..43bd8c55368d0bb1dca3a16ea4e0b1d6
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new Squid.SquidRandomMovementGoal(this));
 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 fe546baadc2e238667386c494359ddf904dd41e5..3d40df730780fcc91c3a352c7572e60458fc5bb0 100644
+index 3ec6caf965c9a69eb56e507e2c452129064d3c68..b8b4ca31ad2fc5292082905c979a974a4ed42dab 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 @@ -77,6 +77,11 @@ public class TropicalFish extends AbstractSchoolingFish implements VariantHolder
@@ -587,7 +587,7 @@ index 5242059484fb5f407a2da2b0c01a8feeaf1c3a64..f623586530e9e7783653b95c8c30d07d
      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 6503f68345d931ac73e8291add6ed108c10ceb60..5183ac5534b77230f04734264eadbb8d3f0ff7ef 100644
+index 5efed70522657c2a02f869affc6755332082cf97..2971b868210ffb3390d19c7f8079fcc60f7d00b0 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
 @@ -47,6 +47,21 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
@@ -611,7 +611,7 @@ index 6503f68345d931ac73e8291add6ed108c10ceb60..5183ac5534b77230f04734264eadbb8d
 +
      @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 1c6be506804b9622c4d0094814939f894ca857df..34d87ab749a62c5d897b7bc66b116a801324b6a7 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
@@ -800,7 +800,7 @@ index 8fbfd134005c0813406fecbce8a918cd0376d03e..51ccbf3bd77bbcf77833b39fadc6c01f
  
          } else {
 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 929074db505e0838a9b133228f81cad87bdab5fb..7b55851008f711a5968fcdf94c0ad18bcd6cf9ee 100644
+index b48bb11029e2726cde2e8f624b8c1ad159740e3a..cfd7d5caeb8bacc5ce314bd700cb21e98a9f667b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Blaze.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
 @@ -74,6 +74,11 @@ public class Blaze extends Monster {
@@ -1022,7 +1022,7 @@ index 4d50d10016a3b574d67bdfec5aee910cede8ffc3..c00530db0eff302c14dd9c52d1d988cb
      protected void registerGoals() {
          super.registerGoals();
 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 6c4422adf858595a740f6f8758db18859dc33004..8cdce384f6d191231012788f27753f0f03753460 100644
+index b60e01a6cfce467f2e0a95a52f5ad7379d9fe574..79264a538b64a473b5a50aa87011f1f6db617525 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
 @@ -47,6 +47,26 @@ public class MagmaCube extends Slime {