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

@@ -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;
}