aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0843-Expand-PlayerItemMendEvent.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0843-Expand-PlayerItemMendEvent.patch')
-rw-r--r--patches/server/0843-Expand-PlayerItemMendEvent.patch69
1 files changed, 69 insertions, 0 deletions
diff --git a/patches/server/0843-Expand-PlayerItemMendEvent.patch b/patches/server/0843-Expand-PlayerItemMendEvent.patch
new file mode 100644
index 0000000000..617b45a407
--- /dev/null
+++ b/patches/server/0843-Expand-PlayerItemMendEvent.patch
@@ -0,0 +1,69 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Thu, 20 Jan 2022 18:11:20 -0800
+Subject: [PATCH] Expand PlayerItemMendEvent
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
+index adc3e6298a1946fdea029c82a9954fb5b6e24497..a207a31d80a302dbdfe80f8727222542d3a78da2 100644
+--- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
++++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
+@@ -344,7 +344,7 @@ public class ExperienceOrb extends Entity {
+ ItemStack itemstack = (ItemStack) entry.getValue();
+ int j = Math.min(this.xpToDurability(amount), itemstack.getDamageValue());
+ // CraftBukkit start
+- org.bukkit.event.player.PlayerItemMendEvent event = CraftEventFactory.callPlayerItemMendEvent(player, this, itemstack, entry.getKey(), j);
++ org.bukkit.event.player.PlayerItemMendEvent event = CraftEventFactory.callPlayerItemMendEvent(player, this, itemstack, entry.getKey(), j, this::durabilityToXp); // Paper - Expand PlayerItemMendEvent
+ j = event.getRepairAmount();
+ if (event.isCancelled()) {
+ return amount;
+@@ -352,8 +352,13 @@ public class ExperienceOrb extends Entity {
+ // CraftBukkit end
+
+ itemstack.setDamageValue(itemstack.getDamageValue() - j);
+- int k = amount - this.durabilityToXp(j);
++ int k = amount - event.getDurabilityToXpOperation().applyAsInt(j); // Paper - Expand PlayerItemMendEvent
+ this.value = k; // CraftBukkit - update exp value of orb for PlayerItemMendEvent calls
++ // Paper start - Expand PlayerItemMendEvent
++ if (j == 0 && amount == k) { // if repair amount is 0 and no xp was removed, don't do recursion; treat as cancelled
++ return k;
++ }
++ // Paper end - Expand PlayerItemMendEvent
+
+ return k > 0 ? this.repairPlayerItems(player, k) : 0;
+ } else {
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+index 37c23923ebd4dfd6405d3c19fa42609fc683a42e..7c039d79b6fba3358daaaf8894e05d9493fa6af8 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -1835,11 +1835,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+ orb.setPosRaw(handle.getX(), handle.getY(), handle.getZ());
+
+ int i = Math.min(orb.xpToDurability(amount), itemstack.getDamageValue());
+- org.bukkit.event.player.PlayerItemMendEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemMendEvent(handle, orb, itemstack, stackEntry.getKey(), i);
++ org.bukkit.event.player.PlayerItemMendEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemMendEvent(handle, orb, itemstack, stackEntry.getKey(), i, orb::durabilityToXp); // Paper - Expand PlayerItemMendEvent
+ i = event.getRepairAmount();
+ orb.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DESPAWN);
+ if (!event.isCancelled()) {
+- amount -= orb.durabilityToXp(i);
++ amount -= event.getDurabilityToXpOperation().applyAsInt(i); // Paper - Expand PlayerItemMendEvent
+ itemstack.setDamageValue(itemstack.getDamageValue() - i);
+ }
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+index e9a70547324dabd97dc90820515a11d2b630a704..c1b5d9713cb301dc06b74d97dca4fd5562c539e2 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -1267,10 +1267,10 @@ public class CraftEventFactory {
+ return event;
+ }
+
+- public static PlayerItemMendEvent callPlayerItemMendEvent(net.minecraft.world.entity.player.Player entity, net.minecraft.world.entity.ExperienceOrb orb, net.minecraft.world.item.ItemStack nmsMendedItem, net.minecraft.world.entity.EquipmentSlot slot, int repairAmount) {
++ public static PlayerItemMendEvent callPlayerItemMendEvent(net.minecraft.world.entity.player.Player entity, net.minecraft.world.entity.ExperienceOrb orb, net.minecraft.world.item.ItemStack nmsMendedItem, net.minecraft.world.entity.EquipmentSlot slot, int repairAmount, java.util.function.IntUnaryOperator durabilityToXpOp) { // Paper - Expand PlayerItemMendEvent
+ Player player = (Player) entity.getBukkitEntity();
+ org.bukkit.inventory.ItemStack bukkitStack = CraftItemStack.asCraftMirror(nmsMendedItem);
+- PlayerItemMendEvent event = new PlayerItemMendEvent(player, bukkitStack, CraftEquipmentSlot.getSlot(slot), (ExperienceOrb) orb.getBukkitEntity(), repairAmount);
++ PlayerItemMendEvent event = new PlayerItemMendEvent(player, bukkitStack, CraftEquipmentSlot.getSlot(slot), (ExperienceOrb) orb.getBukkitEntity(), repairAmount, durabilityToXpOp); // Paper - Expand PlayerItemMendEvent
+ Bukkit.getPluginManager().callEvent(event);
+ return event;
+ }