From 9cf9db1dbd33d00755289f812c2e2149fcee7b18 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 12 Jan 2025 14:28:09 -0800 Subject: [PATCH] Shears can have looting enchantment --- ...-Shears-can-have-looting-enchantment.patch | 27 ------------------- .../enchantments/EnchantmentTarget.java.patch | 14 +++++++++- 2 files changed, 13 insertions(+), 28 deletions(-) delete mode 100644 patches/api/0032-Shears-can-have-looting-enchantment.patch diff --git a/patches/api/0032-Shears-can-have-looting-enchantment.patch b/patches/api/0032-Shears-can-have-looting-enchantment.patch deleted file mode 100644 index d9c0fb00f..000000000 --- a/patches/api/0032-Shears-can-have-looting-enchantment.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: BillyGalbreath -Date: Mon, 3 Jan 2022 02:00:50 -0600 -Subject: [PATCH] Shears can have looting enchantment - - -diff --git a/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java b/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java -index bd653ad99e8e75af1494b595640c3910f4d37e6e..13b903e785a9ef5e513cb9d6483482133cc5f25b 100644 ---- a/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java -+++ b/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java -@@ -238,6 +238,16 @@ public enum EnchantmentTarget { - public boolean includes(@NotNull Material item) { - return item.equals(Material.BOW) || item.equals(Material.CROSSBOW); - } -+ }, -+ -+ /** -+ * Allow the Enchantment to be placed on shears. -+ */ -+ WEAPON_AND_SHEARS { -+ @Override -+ public boolean includes(@NotNull Material item) { -+ return WEAPON.includes(item) || item.equals(Material.SHEARS); -+ } - // Purpur end - }; - diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java.patch index f172aafb6..45b679507 100644 --- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java.patch +++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java +++ b/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java -@@ -227,6 +_,18 @@ +@@ -227,6 +_,30 @@ public boolean includes(@NotNull Material item) { return BREAKABLE.includes(item) || (WEARABLE.includes(item) && !item.equals(Material.ELYTRA)) || item.equals(Material.COMPASS); } @@ -16,6 +16,18 @@ + return item.equals(Material.BOW) || item.equals(Material.CROSSBOW); + } + // Purpur end - Add enchantment target for bows and crossbows ++ // Purpur start - Shears can have looting enchantment ++ }, ++ ++ /** ++ * Allow the Enchantment to be placed on shears. ++ */ ++ WEAPON_AND_SHEARS { ++ @Override ++ public boolean includes(@NotNull Material item) { ++ return WEAPON.includes(item) || item.equals(Material.SHEARS); ++ } ++ // Purpur end - Shears can have looting enchantment }; /**