aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0164-Ability-to-apply-mending-to-XP-API.patch
diff options
context:
space:
mode:
authorShane Freeder <[email protected]>2024-07-08 22:30:01 +0100
committerShane Freeder <[email protected]>2024-07-08 22:30:01 +0100
commita74d9bf629ab2d502831fb36a251cdac0ab30522 (patch)
tree44af854a258c4f9119f2caa6db257e4e3a1e6e52 /patches/server/0164-Ability-to-apply-mending-to-XP-API.patch
parent6723f5498616da919762c68978e13c518943ef40 (diff)
parent70b0e844767131681400b3dbace06c2dea13f87c (diff)
downloadPaper-chore/terminal.tar.gz
Paper-chore/terminal.zip
Merge remote-tracking branch 'origin/master' into chore/terminalchore/terminal
Diffstat (limited to 'patches/server/0164-Ability-to-apply-mending-to-XP-API.patch')
-rw-r--r--patches/server/0164-Ability-to-apply-mending-to-XP-API.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0164-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0164-Ability-to-apply-mending-to-XP-API.patch
index fd8b647890..5b73d571fb 100644
--- a/patches/server/0164-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/server/0164-Ability-to-apply-mending-to-XP-API.patch
@@ -14,10 +14,10 @@ public net.minecraft.world.entity.ExperienceOrb durabilityToXp(I)I
public net.minecraft.world.entity.ExperienceOrb xpToDurability(I)I
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9eddc3ac16645e0a01cc5c2decc8e53f08e7e3dc..aaef5693b044141d2aa8108b74b240903c64e6e6 100644
+index 8d2c795d8898cd32611366b972b35d132c22eca7..f85711a2ff57498f385da7da9b77ec130aff116b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1637,7 +1637,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1638,7 +1638,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
@Override