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)
This commit is contained in:
William Blake Galbreath
2021-07-24 00:40:35 -05:00
parent 47cd87803c
commit 1f2af493ef
5 changed files with 15 additions and 15 deletions

View File

@@ -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()) {