Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
b173db6 Fix flat bedrock (#6255)
9b82850 Updated Upstream (CraftBukkit) (#6260)
9a0263e Updated Upstream (CraftBukkit)

gradle.properties

@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
 mcVersion = 1.17.1
 packageVersion = 1_17_R1
 
-paperCommit = 170382fe3552586dc381c001b08e6fdbb42d47c0
+paperCommit = 9a0263e2ac2a4bd52274c836b6ee70f064acef74
 
 org.gradle.parallel = true
 org.gradle.vfs.watch = false

patches/server/0005-Ridables.patch

@@ -1177,10 +1177,10 @@ index ec00c2dd8f969eb99ec6a014e3bcd09c7484b237..63b739c86d2ea22aa9a610796ad2f208
                  float f1 = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F;
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index d9fb3df35de94ae5abbb86ace0328bbe6f5403b3..0e066782ee09bb5626715bcc500bc04f2252bc2e 100644
+index b2765fba362e5f6d641abcc9ee7ccc177db08eb5..81a393f29643a0cf3478ca8ff640c21153d1514b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-@@ -59,6 +59,18 @@ public class MushroomCow extends Cow implements Shearable {
+@@ -61,6 +61,18 @@ public class MushroomCow extends Cow implements Shearable {
          super(type, world);
      }
  
@@ -1199,7 +1199,7 @@ index d9fb3df35de94ae5abbb86ace0328bbe6f5403b3..0e066782ee09bb5626715bcc500bc04f
      @Override
      public float getWalkTargetValue(BlockPos pos, LevelReader world) {
          return world.getBlockState(pos.below()).is(Blocks.MYCELIUM) ? 10.0F : world.getBrightness(pos) - 0.5F;
-@@ -120,7 +132,7 @@ public class MushroomCow extends Cow implements Shearable {
+@@ -122,7 +134,7 @@ public class MushroomCow extends Cow implements Shearable {
          } else if (itemstack.is(Items.SHEARS) && this.readyForShearing()) {
              // CraftBukkit start
              if (!CraftEventFactory.handlePlayerShearEntityEvent(player, this, itemstack, hand)) {
@@ -1208,7 +1208,7 @@ index d9fb3df35de94ae5abbb86ace0328bbe6f5403b3..0e066782ee09bb5626715bcc500bc04f
              }
              // CraftBukkit end
              this.shear(SoundSource.PLAYERS);
-@@ -141,7 +153,7 @@ public class MushroomCow extends Cow implements Shearable {
+@@ -143,7 +155,7 @@ public class MushroomCow extends Cow implements Shearable {
                  Optional<Pair<MobEffect, Integer>> optional = this.getEffectFromItemStack(itemstack);
  
                  if (!optional.isPresent()) {

patches/server/0006-Configurable-entity-base-attributes.patch

@@ -206,10 +206,10 @@ index 63b739c86d2ea22aa9a610796ad2f208b0db289e..f4e983da7206923ee0b0f984e65a6c2b
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index 0e066782ee09bb5626715bcc500bc04f2252bc2e..e08618d418f44789441177e6ac5877e5e10207a8 100644
+index 81a393f29643a0cf3478ca8ff640c21153d1514b..b9aeb196f61582801416dab21c12d50e2e68d39e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-@@ -69,6 +69,11 @@ public class MushroomCow extends Cow implements Shearable {
+@@ -71,6 +71,11 @@ public class MushroomCow extends Cow implements Shearable {
      public boolean rideableUnderWater() {
          return level.purpurConfig.mooshroomRidableInWater;
      }

patches/server/0041-Fix-cow-rotation-when-shearing-mooshroom.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix cow rotation when shearing mooshroom
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index e08618d418f44789441177e6ac5877e5e10207a8..e7818390e6b8130312fc5a607fae1d1fc094a36a 100644
+index b9aeb196f61582801416dab21c12d50e2e68d39e..9dde33111658b2b80dfe9609114067332ec7df27 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-@@ -192,7 +192,13 @@ public class MushroomCow extends Cow implements Shearable {
+@@ -194,7 +194,13 @@ public class MushroomCow extends Cow implements Shearable {
  
              entitycow.moveTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
              entitycow.setHealth(this.getHealth());

patches/server/0118-Make-entity-breeding-times-configurable.patch

@@ -20,7 +20,7 @@ index 8419ce671cff4b59e44376f9d874a6bdb53b3b13..dfbceb36813c9fd55bc481779bea0ce9
              world.broadcastEntityEvent(entityvillager2, (byte) 12);
              return Optional.of(entityvillager2);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Animal.java b/src/main/java/net/minecraft/world/entity/animal/Animal.java
-index 7a90c6a628571730eee382e1efcfe1b90a5ecfc5..2caf41f458f38729902e040d65f56c786c954950 100644
+index d5d9f8e9c7119ae159a085aa414fc7f303be72a5..ff67d13f646551d7d4d2a169be656c9856f11324 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Animal.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Animal.java
 @@ -38,6 +38,7 @@ public abstract class Animal extends AgeableMob {
@@ -77,7 +77,7 @@ index 1cbbc29ef19c8f1b8f96882213b662cfcb193033..052d1e51a891ee17bed0043f6f3fd162
  
      public ResourceLocation getResourceLocation() {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-index eaec6eba96db3b8ce046208a4a1e5fc4b26b7dcc..a907520c2cd9eacf2fe80d87004afc5f30b6a630 100644
+index 35cf6b9fb4d72df905d93bf52c02846b21b04007..50bd7f218ed5c85f52e8e53f027623a5ec12078b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 @@ -70,6 +70,11 @@ public class Chicken extends Animal {
@@ -138,10 +138,10 @@ index 406b6ed8084c18da1062d8e8049bdfff65101565..ba1bfad397d62dd6feccdbbe3288997c
                  this.partner.resetLove();
                  worldserver.addAllEntities(entityfox, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BREEDING); // CraftBukkit - added SpawnReason
 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index e7818390e6b8130312fc5a607fae1d1fc094a36a..3d3f333a4c77d0d6e82a54aac190772dd6b9bab4 100644
+index 9dde33111658b2b80dfe9609114067332ec7df27..417640879f17081591b1ed23c6704a8b68069942 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-@@ -74,6 +74,11 @@ public class MushroomCow extends Cow implements Shearable {
+@@ -76,6 +76,11 @@ public class MushroomCow extends Cow implements Shearable {
      public void initAttributes() {
          this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.mooshroomMaxHealth);
      }
@@ -170,7 +170,7 @@ index de0247899f0bf785a94e39e170c8e2fc8a58b590..3b8c3aaa7f8249dafea44b306583cf7f
  
      public boolean isTrusting() {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index 13ef0071b98ad2b7654914b62711a661f14b2c42..e9859935a5f18d2c51020ce5772ecf7264787773 100644
+index d0c10a6d465e2ac9a1bec04080a23dfb081e9f3e..a1538e9b97745dd775b48d38f14cff1b3fb1dd2e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
 @@ -133,6 +133,11 @@ public class Panda extends Animal {
@@ -298,7 +298,7 @@ index ae416b70109c959980b3115da6e97df1610996ca..ef4abaf68de01b0879f7d0b330d2d57c
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index cdc8e548ea48efd481ad6495cab6d8e9f77cfb15..c9056e16015f6e0ed9e5da03ad036162dbab4d09 100644
+index 6986a6f1a862617505a00923c5aa3cd798d4e9da..80c0e17f49b6d8f060122eed5bc6d67299ad3f5c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 @@ -110,6 +110,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {