Updated Upstream (Bukkit/CraftBukkit) (#8172)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
23f557a0 SPIGOT-5380, SPIGOT-6958, PR-772: Add some missing entity API

CraftBukkit Changes:
fc3071161 SPIGOT-5380, SPIGOT-6958, PR-1085: Add some missing entity API

patches/server/Turtle-API.patch

@@ -56,14 +56,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 @@ -0,0 +0,0 @@ public class CraftTurtle extends CraftAnimals implements Turtle {
-     public EntityType getType() {
-         return EntityType.TURTLE;
+     public boolean isLayingEgg() {
+         return this.getHandle().isLayingEgg();
      }
 +
 +    // Paper start
 +    @Override
 +    public org.bukkit.Location getHome() {
-+        return net.minecraft.server.MCUtil.toLocation(getHandle().level, getHandle().getHomePos());
++        return net.minecraft.server.MCUtil.toLocation(getHandle().getLevel(), getHandle().getHomePos());
 +    }
 +
 +    @Override
@@ -82,18 +82,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +
 +    @Override
-+    public boolean hasEgg() {
-+        return getHandle().hasEgg();
-+    }
-+
-+    @Override
 +    public void setHasEgg(boolean hasEgg) {
 +        getHandle().setHasEgg(hasEgg);
 +    }
-+
-+    @Override
-+    public boolean isLayingEgg() {
-+        return this.getHandle().isLayingEgg();
-+    }
 +    // Paper end
  }