Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ci skip] clean up unsafe enchants diff

Browse Source
This commit is contained in:
granny
2025-02-06 14:07:50 -08:00
parent d8aadde1f8
commit 9680ad8e57
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
purpur-server/minecraft-patches/sources/net/minecraft/world/inventory/AnvilMenu.java.patch
View File

@@ -64,7 +64,7 @@
ItemStack itemStack = item.copy(); ItemStack itemStack = item.copy();
ItemStack item1 = this.inputSlots.getItem(1); ItemStack item1 = this.inputSlots.getItem(1);
ItemEnchantments.Mutable mutable = new ItemEnchantments.Mutable(EnchantmentHelper.getEnchantmentsForCrafting(itemStack)); ItemEnchantments.Mutable mutable = new ItemEnchantments.Mutable(EnchantmentHelper.getEnchantmentsForCrafting(itemStack));
@@ -191,23 +_,36 @@ @@ -191,23 +_,34 @@
int intValue = entry.getIntValue(); int intValue = entry.getIntValue();
intValue = level == intValue ? intValue + 1 : Math.max(intValue, level); intValue = level == intValue ? intValue + 1 : Math.max(intValue, level);
Enchantment enchantment = holder.value(); Enchantment enchantment = holder.value();
@@ -77,25 +77,21 @@
canEnchant = true; canEnchant = true;
} }
- for (Holder<Enchantment> holder1 : mutable.keySet()) { + java.util.Set<Holder<Enchantment>> removedEnchantments = new java.util.HashSet<>(); // Purpur - Config to allow unsafe enchants
+ // Purpur start - Config to allow unsafe enchants for (Holder<Enchantment> holder1 : mutable.keySet()) {
+ java.util.Iterator<Holder<Enchantment>> mutableIterator = mutable.keySet().iterator();
+ while (mutableIterator.hasNext()) {
+ Holder<Enchantment> holder1 = mutableIterator.next();
+ // Purpur end - Config to allow unsafe enchants
if (!holder1.equals(holder) && !Enchantment.areCompatible(holder, holder1)) { if (!holder1.equals(holder) && !Enchantment.areCompatible(holder, holder1)) {
- canEnchant = false; - canEnchant = false;
- i++; + canEnchant1 = this.canDoUnsafeEnchants || org.purpurmc.purpur.PurpurConfig.allowIncompatibleEnchants; // Purpur - Anvil API // Purpur - canEnchant -> canEnchant1 - Config to allow unsafe enchants
+ canEnchant1 = this.canDoUnsafeEnchants || org.purpurmc.purpur.PurpurConfig.allowIncompatibleEnchants; // Purpur - Anvil API // Purpur - flag3 -> canEnchant1 - Config to allow unsafe enchants
+ // Purpur start - Config to allow unsafe enchants + // Purpur start - Config to allow unsafe enchants
+ if (!canEnchant1 && org.purpurmc.purpur.PurpurConfig.replaceIncompatibleEnchants) { + if (!canEnchant1 && org.purpurmc.purpur.PurpurConfig.replaceIncompatibleEnchants) {
+ mutableIterator.remove(); // replace current enchant with the incompatible one trying to be applied // TODO: is this needed? + removedEnchantments.add(holder1);
+ canEnchant1 = true; + canEnchant1 = true;
+ } + }
+ // Purpur end - Config to allow unsafe enchants + // Purpur end - Config to allow unsafe enchants
+ ++i; i++;
} }
} }
+ mutable.removeIf(removedEnchantments::contains); // Purpur - Config to allow unsafe enchants
- if (!canEnchant) { - if (!canEnchant) {
+ if (!canEnchant || !canEnchant1) { // Purpur - Config to allow unsafe enchants + if (!canEnchant || !canEnchant1) { // Purpur - Config to allow unsafe enchants