diff options
author | Nassim Jahnke <[email protected]> | 2024-02-23 14:37:33 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2024-02-23 14:37:33 +0100 |
commit | 71c84c8132a463ca26978b852bbbf33ae42cd4ce (patch) | |
tree | bbdde5e8056d16ba6778e56165db39b1f6d44468 /patches/api/0326-Add-more-Campfire-API.patch | |
parent | 3ea95efdebba7254e842dec66214f71de4721993 (diff) | |
download | Paper-71c84c8132a463ca26978b852bbbf33ae42cd4ce.tar.gz Paper-71c84c8132a463ca26978b852bbbf33ae42cd4ce.zip |
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
Diffstat (limited to 'patches/api/0326-Add-more-Campfire-API.patch')
-rw-r--r-- | patches/api/0326-Add-more-Campfire-API.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/patches/api/0326-Add-more-Campfire-API.patch b/patches/api/0326-Add-more-Campfire-API.patch new file mode 100644 index 0000000000..80cdc0bb39 --- /dev/null +++ b/patches/api/0326-Add-more-Campfire-API.patch @@ -0,0 +1,51 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: LemonCaramel <[email protected]> +Date: Fri, 16 Jul 2021 00:38:52 +0900 +Subject: [PATCH] Add more Campfire API + + +diff --git a/src/main/java/org/bukkit/block/Campfire.java b/src/main/java/org/bukkit/block/Campfire.java +index f8a344cabb7b5a6d1c5409798a0a98b023bcd756..9c3952459ed216f727b3654b2ed536f17f320402 100644 +--- a/src/main/java/org/bukkit/block/Campfire.java ++++ b/src/main/java/org/bukkit/block/Campfire.java +@@ -69,4 +69,40 @@ public interface Campfire extends TileState { + * @param cookTimeTotal Cook time total + */ + void setCookTimeTotal(int index, int cookTimeTotal); ++ ++ // Paper start ++ /** ++ * Disable cooking in all slots. ++ */ ++ void stopCooking(); ++ ++ /** ++ * Re-enable cooking in all slots. ++ */ ++ void startCooking(); ++ ++ /** ++ * Disable cooking in the specified slot index. ++ * ++ * @param index item slot index ++ * @return whether the slot had cooking enabled before this call ++ */ ++ boolean stopCooking(int index); ++ ++ /** ++ * Re-enable cooking in the specified slot index. ++ * ++ * @param index item slot index ++ * @return whether the slot couldn't cook before this call ++ */ ++ boolean startCooking(int index); ++ ++ /** ++ * State of slot index. ++ * ++ * @param index item slot index ++ * @return {@code true} if the specified slot index cannot cook ++ */ ++ boolean isCookingDisabled(int index); ++ // Paper end + } |