diff options
author | Jason Penilla <[email protected]> | 2021-11-23 00:57:41 -0800 |
---|---|---|
committer | MiniDigger | Martin <[email protected]> | 2021-11-30 19:26:33 +0100 |
commit | a8ef7aa56f260dbb9fccdd88354b34ee3d110e8f (patch) | |
tree | ea651b6241e94ad2b023d8961426e9cbf51e7521 /patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch | |
parent | 79b873c90104812163f1e87ae5020779300eb347 (diff) | |
download | Paper-a8ef7aa56f260dbb9fccdd88354b34ee3d110e8f.tar.gz Paper-a8ef7aa56f260dbb9fccdd88354b34ee3d110e8f.zip |
Prepare for updating server patches
Diffstat (limited to 'patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch')
-rw-r--r-- | patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch b/patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch deleted file mode 100644 index 49c255c056..0000000000 --- a/patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tassu <[email protected]> -Date: Thu, 13 Sep 2018 08:45:01 +0300 -Subject: [PATCH] Implement furnace cook speed multiplier API - -Signed-off-by: Tassu <[email protected]> - -diff --git a/src/main/java/org/bukkit/block/Furnace.java b/src/main/java/org/bukkit/block/Furnace.java -index c5a8c96fa2204d6b4d2409b1bfc97697d39d964e..9063cf370a0fe66c2a27086e125f9111b77366ae 100644 ---- a/src/main/java/org/bukkit/block/Furnace.java -+++ b/src/main/java/org/bukkit/block/Furnace.java -@@ -61,6 +61,26 @@ public interface Furnace extends Container { - */ - public void setCookTimeTotal(int cookTimeTotal); - -+ // Paper start -+ /** -+ * Gets the cook speed multiplier that this {@link Furnace} will cook -+ * compared to vanilla. -+ * -+ * @return the multiplier, a value between 0 and 200 -+ */ -+ public double getCookSpeedMultiplier(); -+ -+ /** -+ * Sets the speed multiplier that this {@link Furnace} will cook -+ * compared to vanilla. -+ * -+ * @param multiplier the multiplier to set, a value between 0 and 200 -+ * @throws IllegalArgumentException if value is less than 0 -+ * @throws IllegalArgumentException if value is more than 200 -+ */ -+ public void setCookSpeedMultiplier(double multiplier); -+ // Paper end -+ - @NotNull - @Override - public FurnaceInventory getInventory(); -diff --git a/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java b/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java -index 533a33dbd4c4c3c07fe759206dc288efec5cd531..f13f1b4daa99fb86b60acc94d0406dcd8cb4d98b 100644 ---- a/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java -+++ b/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java -@@ -13,11 +13,18 @@ public class FurnaceStartSmeltEvent extends BlockEvent { - private final CookingRecipe<?> recipe; - private int totalCookTime; - -+ @Deprecated // Paper - furnace cook speed multiplier - public FurnaceStartSmeltEvent(@NotNull final Block furnace, @NotNull ItemStack source, @NotNull final CookingRecipe<?> recipe) { -+ // Paper start - furnace cook speed multiplier -+ this(furnace, source, recipe, recipe.getCookingTime()); -+ } -+ -+ public FurnaceStartSmeltEvent(@NotNull final Block furnace, @NotNull ItemStack source, @NotNull CookingRecipe<?> recipe, int cookingTime) { -+ // Paper end - super(furnace); - this.source = source; - this.recipe = recipe; -- this.totalCookTime = recipe.getCookingTime(); -+ this.totalCookTime = cookingTime; // Paper - furnace cook speed multiplier - } - - /** |