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/api/0161-Turtle-API.patch

@@ -221,10 +221,10 @@ index 0000000000000000000000000000000000000000..abeb24fccda2acfdb0dfdadacb8fe688
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Turtle.java b/src/main/java/org/bukkit/entity/Turtle.java
-index 0a4cd29930c2f1c28f5a3e6884c7dec45b5cac11..8bee07c81172e189fab9b82b398983f509099474 100644
+index 5584936158e3762d348cb2eaee2082da24ede367..aa83615a0c6565c9874c906a83cfe20c2a964b22 100644
 --- a/src/main/java/org/bukkit/entity/Turtle.java
 +++ b/src/main/java/org/bukkit/entity/Turtle.java
-@@ -1,6 +1,62 @@
+@@ -1,5 +1,8 @@
  package org.bukkit.entity;
  
 +import org.bukkit.Location;
@@ -233,10 +233,12 @@ index 0a4cd29930c2f1c28f5a3e6884c7dec45b5cac11..8bee07c81172e189fab9b82b398983f5
  /**
   * Represents a turtle.
   */
--public interface Turtle extends Animals { }
-+public interface Turtle extends Animals {
-+    // Paper start
+@@ -18,4 +21,42 @@ public interface Turtle extends Animals {
+      * @return Whether the turtle is laying an egg
+      */
+     boolean isLayingEgg();
 +
++    // Paper start
 +    /**
 +     * Get the turtle's home location
 +     *
@@ -267,24 +269,10 @@ index 0a4cd29930c2f1c28f5a3e6884c7dec45b5cac11..8bee07c81172e189fab9b82b398983f5
 +    boolean isDigging();
 +
 +    /**
-+     * Get if turtle is carrying egg
-+     *
-+     * @return True if carrying egg
-+     */
-+    boolean hasEgg();
-+
-+    /**
 +     * Set if turtle is carrying egg
 +     *
 +     * @param hasEgg True if carrying egg
 +     */
 +    void setHasEgg(boolean hasEgg);
-+
-+    /**
-+     * Returns whether the turtle is currently laying an egg.
-+     *
-+     * @return whether the turtle is laying an egg
-+     */
-+    boolean isLayingEgg();
 +    // Paper end
-+}
+ }