diff --git a/README.md b/README.md index ab83fa4b8..fcb63daad 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ Maven org.purpurmc.purpur purpur-api - 1.21-R0.1-SNAPSHOT + 1.21.1-R0.1-SNAPSHOT provided ``` @@ -80,7 +80,7 @@ repositories { ``` ```kotlin dependencies { - compileOnly("org.purpurmc.purpur:purpur-api:1.21-R0.1-SNAPSHOT") + compileOnly("org.purpurmc.purpur:purpur-api:1.21.1-R0.1-SNAPSHOT") } ``` diff --git a/patches/server/0016-Anvil-API.patch b/patches/server/0016-Anvil-API.patch index 9569656a3..ba90d7340 100644 --- a/patches/server/0016-Anvil-API.patch +++ b/patches/server/0016-Anvil-API.patch @@ -136,36 +136,32 @@ index 7de5e47f9a54263734eeef855a2dc07ef64d30ea..b3bd9bbd96efc4784b86c2be6bb857da return itemstack; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java -index 792cb6adf0c7a6335cc5985fce8bed2e0f1149af..aa59dcdea74434993dbb9d8a7b2fc3bfae9d0a77 100644 +index 792cb6adf0c7a6335cc5985fce8bed2e0f1149af..5734c5caffda79383ae30df20c3defb51b87f39e 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java -@@ -3,6 +3,7 @@ package org.bukkit.craftbukkit.inventory; - import com.google.common.base.Preconditions; - import java.util.function.Consumer; - import net.minecraft.world.Container; -+import net.minecraft.world.inventory.AnvilMenu; - import org.bukkit.Location; - import org.bukkit.craftbukkit.inventory.view.CraftAnvilView; - import org.bukkit.entity.HumanEntity; -@@ -19,6 +20,8 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn +@@ -19,6 +19,10 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn private int repairCost; private int repairCostAmount; private int maximumRepairCost; ++ // Purpur start - Anvil API + private boolean bypassCost; + private boolean canDoUnsafeEnchants; ++ // Purpur end - Anvil API public CraftInventoryAnvil(Location location, Container inventory, Container resultInventory) { super(inventory, resultInventory); -@@ -27,6 +30,8 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn +@@ -27,6 +31,10 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn this.repairCost = CraftInventoryAnvil.DEFAULT_REPAIR_COST; this.repairCostAmount = CraftInventoryAnvil.DEFAULT_REPAIR_COST_AMOUNT; this.maximumRepairCost = CraftInventoryAnvil.DEFAULT_MAXIMUM_REPAIR_COST; ++ // Purpur start - Anvil API + this.bypassCost = false; + this.canDoUnsafeEnchants = false; ++ // Purpur end - Anvil API } @Override -@@ -113,4 +118,30 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn +@@ -113,4 +121,30 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn consumer.accept(cav); } }