From addc511ae3067f0849fd7b03777b86caaf148667 Mon Sep 17 00:00:00 2001 From: Encode42 Date: Mon, 27 Jun 2022 19:28:46 -0400 Subject: [PATCH] Fix unsafe enchants patch --- .../0162-Config-to-allow-for-unsafe-enchants.patch | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/patches/server/0162-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0162-Config-to-allow-for-unsafe-enchants.patch index a2b8b955b..b1847e7e9 100644 --- a/patches/server/0162-Config-to-allow-for-unsafe-enchants.patch +++ b/patches/server/0162-Config-to-allow-for-unsafe-enchants.patch @@ -27,7 +27,7 @@ index 7c012f1e37b0085c0939797b0dae8996b4953ab8..155b0a1aa58b891e98a55e10f112f611 ++i; } else if (targets.size() == 1) { diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java -index 10cd589e427f847936f29e33edee3923a4661210..46fc3f504828e402dda50791d6867cb595de766b 100644 +index 10cd589e427f847936f29e33edee3923a4661210..a68dcf3ad04ef9c8e69a0d81eacfe50644463270 100644 --- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java +++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java @@ -208,7 +208,7 @@ public class AnvilMenu extends ItemCombinerMenu { @@ -48,6 +48,15 @@ index 10cd589e427f847936f29e33edee3923a4661210..46fc3f504828e402dda50791d6867cb5 ++i; } } +@@ -229,7 +229,7 @@ public class AnvilMenu extends ItemCombinerMenu { + flag2 = true; + } else { + flag1 = true; +- if (i2 > enchantment.getMaxLevel()) { ++ if (!org.purpurmc.purpur.PurpurConfig.allowUnsafeEnchants && i2 > enchantment.getMaxLevel()) { // Purpur + i2 = enchantment.getMaxLevel(); + } + @@ -332,7 +332,7 @@ public class AnvilMenu extends ItemCombinerMenu { sendAllDataToRemote(); // CraftBukkit - SPIGOT-6686: Always send completed inventory to stay in sync with client this.broadcastChanges(); @@ -75,7 +84,7 @@ index 5b79adf2e036b4e9c2abd7cea53f1ef064252d7a..520c76a7a2baa3091224c96580a861a6 this.getOrCreateTag().put(key, element); } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 88ab4288b0853369d62ea6c5a87a49954147699e..d3f793b285b8afbf030dd32b8829c986ee10eada 100644 +index 111bea3e08b998003ee4c8d81f61ab43247ca793..bd8c2caaf717621eda0427e4cdea240245180f1a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -278,6 +278,8 @@ public class PurpurConfig {