Merge branch 'master' into pre/1.13

Spigot-API-Patches/Ability-to-apply-mending-to-XP-API.patch

@@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 22b8cb916..805faaf35 100644
+index 17c74f0ce..15bcb2929 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -40,8 +40,8 @@ index 22b8cb916..805faaf35 100644
 +     *
 +     * Can also be called with {@link #giveExp(int, boolean)} by passing true to applyMending
 +     *
-+     * @param amount
-+     * @return
++     * @param amount Exp to apply
++     * @return the remaining experience
 +     */
 +    public int applyMending(int amount);
 +    // Paper end