mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 07:48:53 +01:00
73983e4c16
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: 3dc4cdcd Update to Minecraft 1.14.3-pre4 88b25a8c SPIGOT-5098: Add a method to allow colored sign changes 6d913552 Update to Minecraft 1.14.3-pre4 CraftBukkit Changes:f1f33559Update to Minecraft 1.14.38a3d3f49SPIGOT-5098: Add a method to allow colored sign changes533290e2SPIGOT-5100: Console warning from pig zombie targeting6dde4b9fSPIGOT-5094: Allow opening merchant for wandering traders and hide the xp bar for custom merchants9af90077SPIGOT-5097: Bukkit.clearRecipes() no longer working38fa220fFix setting game rules via the APIfe3930ceUpdate to Minecraft 1.14.3-pre4da071ec5Remove outdated build delay. Spigot Changes: 4d2f30f1 Update to Minecraft 1.14.3 f16400e3 Update to Minecraft 1.14.3-pre4
53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
From bd2a47a6ee4f1377158cdae2ce956b246ffaa488 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 ce4ea22c..d069a84c 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -969,12 +969,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
|
|
--
|
|
2.22.0
|
|
|