diff options
| author | Fabrizio La Rosa <[email protected]> | 2024-09-08 22:12:36 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-09-08 22:12:36 +0200 |
| commit | 971a7a5511b3c656b96a9be66ec9848915eb6d3d (patch) | |
| tree | 14db760bce66a267a4e0bdbb7da01a675c2bf750 /patches/server/0949-Item-Mutation-Fixes.patch | |
| parent | b09eaf2e8d15fea856005f6727638b753850c8d1 (diff) | |
| download | Paper-971a7a5511b3c656b96a9be66ec9848915eb6d3d.tar.gz Paper-971a7a5511b3c656b96a9be66ec9848915eb6d3d.zip | |
Add Decorated Pot Cracked API (#11365)
Diffstat (limited to 'patches/server/0949-Item-Mutation-Fixes.patch')
| -rw-r--r-- | patches/server/0949-Item-Mutation-Fixes.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/patches/server/0949-Item-Mutation-Fixes.patch b/patches/server/0949-Item-Mutation-Fixes.patch new file mode 100644 index 0000000000..bad3be61f9 --- /dev/null +++ b/patches/server/0949-Item-Mutation-Fixes.patch @@ -0,0 +1,38 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Owen1212055 <[email protected]> +Date: Wed, 20 Mar 2024 20:41:35 -0400 +Subject: [PATCH] Item Mutation Fixes + + +diff --git a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java +index fff1c39920e7d7051dfe3dd39c77865d3bdf113e..1ef014b29645ed09ccffb898f1819428c3dc6259 100644 +--- a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java ++++ b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java +@@ -232,7 +232,7 @@ public class EnchantmentMenu extends AbstractContainerMenu { + return false; + } else if (this.costs[id] > 0 && !itemstack.isEmpty() && (player.experienceLevel >= j && player.experienceLevel >= this.costs[id] || player.getAbilities().instabuild)) { + this.access.execute((world, blockposition) -> { +- ItemStack itemstack2 = itemstack; ++ ItemStack itemstack2 = itemstack; // Paper - diff on change + List<EnchantmentInstance> list = this.getEnchantmentList(world.registryAccess(), itemstack, id, this.costs[id]); + + // CraftBukkit start +@@ -255,10 +255,16 @@ public class EnchantmentMenu extends AbstractContainerMenu { + return; + } + // CraftBukkit end +- if (itemstack.is(Items.BOOK)) { +- itemstack2 = itemstack.transmuteCopy(Items.ENCHANTED_BOOK); ++ // Paper start ++ itemstack2 = org.bukkit.craftbukkit.inventory.CraftItemStack.getOrCloneOnMutation(item, event.getItem()); ++ if (itemstack2 != itemstack) { + this.enchantSlots.setItem(0, itemstack2); + } ++ if (itemstack2.is(Items.BOOK)) { ++ itemstack2 = itemstack2.transmuteCopy(Items.ENCHANTED_BOOK); ++ this.enchantSlots.setItem(0, itemstack2); ++ } ++ // Paper end + + // CraftBukkit start + for (Map.Entry<org.bukkit.enchantments.Enchantment, Integer> entry : event.getEnchantsToAdd().entrySet()) { |