Use internals for getting block/entity countstimings/use-internals

For a long time I've been meaning to move some of this logic internally
as this would allow us to avoid hitting systems like block state snapshots
which can create issues as many of the spigot implementations of this
stuff are increasingly broken, leading to unexpected crashes during ticking,
even if the API cannot properly interact with these such states/items,
it's generally more preferable to not crash the server in the course,
and just let those interactions fail more gracefully.

1 files changed, 0 insertions, 24 deletions

diff --git a/patches/api/0424-MerchantRecipe-add-copy-constructor.patch b/patches/api/0424-MerchantRecipe-add-copy-constructor.patch
deleted file mode 100644
index 1c5ba2803c..0000000000
--- a/patches/api/0424-MerchantRecipe-add-copy-constructor.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Joo200 <[email protected]>
-Date: Tue, 20 Dec 2022 15:26:36 +0100
-Subject: [PATCH] MerchantRecipe: add copy constructor
-
-
-diff --git a/src/main/java/org/bukkit/inventory/MerchantRecipe.java b/src/main/java/org/bukkit/inventory/MerchantRecipe.java
-index afaa21b9347683fa373a938d9b1aa01c2058192a..39f9766a03d420340d79841197f75c8b1dd49f4a 100644
---- a/src/main/java/org/bukkit/inventory/MerchantRecipe.java
-+++ b/src/main/java/org/bukkit/inventory/MerchantRecipe.java
-@@ -91,6 +91,13 @@ public class MerchantRecipe implements Recipe {
-         this.specialPrice = specialPrice;
-     }
- 
-+    // Paper start - add copy ctor
-+    public MerchantRecipe(@NotNull MerchantRecipe recipe) {
-+        this(recipe.result.clone(), recipe.uses, recipe.maxUses, recipe.experienceReward, recipe.villagerExperience, recipe.priceMultiplier, recipe.demand, recipe.specialPrice, recipe.ignoreDiscounts);
-+        this.setIngredients(recipe.ingredients);
-+    }
-+    // Paper end
-+
-     @NotNull
-     @Override
-     public ItemStack getResult() {