2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Wed, 20 Dec 2017 17:36:49 -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.
|
|
|
|
|
2022-11-20 00:53:20 +01:00
|
|
|
== AT ==
|
|
|
|
public net.minecraft.world.entity.ExperienceOrb durabilityToXp(I)I
|
|
|
|
public net.minecraft.world.entity.ExperienceOrb xpToDurability(I)I
|
|
|
|
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2024-01-23 15:43:48 +01:00
|
|
|
index f35a53f6e4af319a4ce6f8e5dc8eb65edb47b6ed..62c531603c68597add75de31749943bd47e4580f 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
Updated Upstream (Bukkit/CraftBukkit) (#10034)
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:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries
CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion
Spigot Changes:
06d602e7 Rebuild patches
2023-12-17 03:09:28 +01:00
|
|
|
@@ -1543,7 +1543,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
2022-01-23 01:59:56 +01:00
|
|
|
@Override
|
|
|
|
- public void giveExp(int exp) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper start
|
|
|
|
+ public int applyMending(int amount) {
|
2022-01-23 01:59:56 +01:00
|
|
|
+ ServerPlayer handle = this.getHandle();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Logic copied from EntityExperienceOrb and remapped to unobfuscated methods/properties
|
2022-01-23 01:59:56 +01:00
|
|
|
+ final var stackEntry = net.minecraft.world.item.enchantment.EnchantmentHelper
|
|
|
|
+ .getRandomItemWith(net.minecraft.world.item.enchantment.Enchantments.MENDING, handle);
|
|
|
|
+ final net.minecraft.world.item.ItemStack itemstack = stackEntry != null ? stackEntry.getValue() : net.minecraft.world.item.ItemStack.EMPTY;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ if (!itemstack.isEmpty() && itemstack.getItem().canBeDepleted()) {
|
2023-06-08 00:12:41 +02:00
|
|
|
+ net.minecraft.world.entity.ExperienceOrb orb = net.minecraft.world.entity.EntityType.EXPERIENCE_ORB.create(handle.level());
|
2021-06-11 14:02:28 +02:00
|
|
|
+ orb.value = amount;
|
|
|
|
+ orb.spawnReason = org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM;
|
|
|
|
+ orb.setPosRaw(handle.getX(), handle.getY(), handle.getZ());
|
|
|
|
+
|
2021-06-17 19:11:00 +02:00
|
|
|
+ int i = Math.min(orb.xpToDurability(amount), itemstack.getDamageValue());
|
2022-10-02 09:56:36 +02:00
|
|
|
+ org.bukkit.event.player.PlayerItemMendEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemMendEvent(handle, orb, itemstack, stackEntry.getKey(), i);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ i = event.getRepairAmount();
|
2021-06-12 18:56:13 +02:00
|
|
|
+ orb.discard();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ if (!event.isCancelled()) {
|
2021-06-17 19:11:00 +02:00
|
|
|
+ amount -= orb.durabilityToXp(i);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ itemstack.setDamageValue(itemstack.getDamageValue() - i);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return amount;
|
|
|
|
+ }
|
|
|
|
+
|
2022-01-23 01:59:56 +01:00
|
|
|
+ @Override
|
2021-06-11 14:02:28 +02:00
|
|
|
+ public void giveExp(int exp, boolean applyMending) {
|
|
|
|
+ if (applyMending) {
|
|
|
|
+ exp = this.applyMending(exp);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
2021-06-12 17:06:20 +02:00
|
|
|
this.getHandle().giveExperiencePoints(exp);
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|