diff options
| author | Shane Freeder <[email protected]> | 2024-07-08 22:30:01 +0100 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2024-07-08 22:30:01 +0100 |
| commit | a74d9bf629ab2d502831fb36a251cdac0ab30522 (patch) | |
| tree | 44af854a258c4f9119f2caa6db257e4e3a1e6e52 /patches/server/0538-More-Enchantment-API.patch | |
| parent | 6723f5498616da919762c68978e13c518943ef40 (diff) | |
| parent | 70b0e844767131681400b3dbace06c2dea13f87c (diff) | |
| download | Paper-chore/terminal.tar.gz Paper-chore/terminal.zip | |
Merge remote-tracking branch 'origin/master' into chore/terminalchore/terminal
Diffstat (limited to 'patches/server/0538-More-Enchantment-API.patch')
| -rw-r--r-- | patches/server/0538-More-Enchantment-API.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0538-More-Enchantment-API.patch b/patches/server/0538-More-Enchantment-API.patch index 70558c14b9..692f90b66a 100644 --- a/patches/server/0538-More-Enchantment-API.patch +++ b/patches/server/0538-More-Enchantment-API.patch @@ -10,7 +10,7 @@ Co-authored-by: Luis <[email protected]> Co-authored-by: Janet Blackquill <[email protected]> diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java -index 3ea6e6678432957c5caaff15ba20f8a8ddb393c9..10a74428ca8f8a869ba0d14f2a9b2126033df684 100644 +index fc6606e1bf2e2c35cb6c84af78859c3441775907..edf4df4d13dc814e98b897a3f8a5fd4757284299 100644 --- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java +++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java @@ -5,6 +5,7 @@ import java.util.Locale; @@ -21,7 +21,7 @@ index 3ea6e6678432957c5caaff15ba20f8a8ddb393c9..10a74428ca8f8a869ba0d14f2a9b2126 import net.minecraft.tags.EnchantmentTags; import org.bukkit.NamespacedKey; import org.bukkit.Registry; -@@ -92,7 +93,7 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine +@@ -90,7 +91,7 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine @Override public boolean isTreasure() { @@ -30,7 +30,7 @@ index 3ea6e6678432957c5caaff15ba20f8a8ddb393c9..10a74428ca8f8a869ba0d14f2a9b2126 } @Override -@@ -169,12 +170,66 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine +@@ -148,12 +149,66 @@ public class CraftEnchantment extends Enchantment implements Handleable<net.mine // Paper start @Override public net.kyori.adventure.text.Component displayName(int level) { |