geforkt von Mirrors/Paper
ada930bf8d
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: cfd18bd0 SPIGOT-6436: Add Player#stopAllSounds CraftBukkit Changes: b58f4299 SPIGOT-6436: Add Player#stopAllSounds eb191612 SPIGOT-6783: Items do not appear in custom anvil inventories 376edf4f SPIGOT-6779: Fix LivingEntity#attack for Player entities 747a73ec SPIGOT-6772: Use entity mailbox and re-schedule entities if they get unloaded
51 Zeilen
1.9 KiB
Diff
51 Zeilen
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 e3c91878cb6d8f6f9ab13f3d439c7b2ab08248af..b74342d1b6e5fe9f2d642ea1862c979f80399ee1 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -993,12 +993,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
|