mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 19:52:55 +01:00
c0d07c1b67
Upstream has released updates that appears 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: f009c3dd SPIGOT-5810, SPIGOT-5835: 'Better' handling of Player.isOnGround e677c370 Update ECJ version 5058a35d SPIGOT-5860: Item.setItemStack should be NotNull CraftBukkit Changes:d77f4d9bSPIGOT-5810, SPIGOT-5835: 'Better' handling of Player.isOnGround53c95627SPIGOT-5865: Piglin does not trigger EntityPickupItemEvent2ab04d24Update ECJ version7884e079SPIGOT-5868: Blocks do not tick in custom nether / end2a848286SPIGOT-5863: Don't check colour in scoreboard length validationf2cbce30SPIGOT-5866: Beehive unknown TargetReason Spigot Changes: ad703da0 SPIGOT-5870: /plugins "website" field shows "version" 1a27cfd8 #98: Improve output of /plugins command using text components 732d5bab Disable checkstyle in Spigot blocks 0199a9a6 #97: Add Memory Usage to Ticks Per Second Command. 33ea98fc SPIGOT-5858: NPE: Joining the server with an invalid dimension
50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Wed, 20 Dec 2017 17:38:07 -0500
|
|
Subject: [PATCH] Ability to apply mending to XP API
|
|
|
|
This allows plugins that give players the ability to apply the experience
|
|
points to the Item Mending formula, which will repair an item instead
|
|
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 2079395c29854ec7e751d210a05f329f31ebb8ad..444a495e53d1be036f7a1bda89bedf438be913c1 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -730,12 +730,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
*/
|
|
public void resetPlayerWeather();
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gives the player the amount of experience specified.
|
|
+ *
|
|
+ * @param amount Exp amount to give
|
|
+ */
|
|
+ public default void giveExp(int amount) {
|
|
+ giveExp(amount, false);
|
|
+ }
|
|
/**
|
|
* Gives the player the amount of experience specified.
|
|
*
|
|
* @param amount Exp amount to give
|
|
+ * @param applyMending Mend players items with mending, with same behavior as picking up orbs. calls {@link #applyMending(int)}
|
|
*/
|
|
- public void giveExp(int amount);
|
|
+ public void giveExp(int amount, boolean applyMending);
|
|
+
|
|
+ /**
|
|
+ * Applies the mending effect to any items just as picking up an orb would.
|
|
+ *
|
|
+ * Can also be called with {@link #giveExp(int, boolean)} by passing true to applyMending
|
|
+ *
|
|
+ * @param amount Exp to apply
|
|
+ * @return the remaining experience
|
|
+ */
|
|
+ public int applyMending(int amount);
|
|
+ // Paper end
|
|
|
|
/**
|
|
* Gives the player the amount of experience levels specified. Levels can
|