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/0432-Limit-setBurnTime-to-valid-short-values.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/0432-Limit-setBurnTime-to-valid-short-values.patch')
| -rw-r--r-- | patches/api/0432-Limit-setBurnTime-to-valid-short-values.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/patches/api/0432-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0432-Limit-setBurnTime-to-valid-short-values.patch new file mode 100644 index 0000000000..2faac56fd8 --- /dev/null +++ b/patches/api/0432-Limit-setBurnTime-to-valid-short-values.patch @@ -0,0 +1,21 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Warrior <[email protected]> +Date: Fri, 18 Aug 2023 08:07:38 +0200 +Subject: [PATCH] Limit setBurnTime to valid short values + + +diff --git a/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java b/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java +index ba4dc8aed85169e55cac276bdd51116919305019..2f80910dd23dacb30c41189a07a4e54117110bb8 100644 +--- a/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java ++++ b/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java +@@ -52,8 +52,8 @@ public class FurnaceBurnEvent extends BlockEvent implements Cancellable { + * + * @param burnTime the burn time for this fuel + */ +- public void setBurnTime(int burnTime) { +- this.burnTime = burnTime; ++ public void setBurnTime(@org.jetbrains.annotations.Range(from = Short.MIN_VALUE, to = Short.MAX_VALUE) int burnTime) { // Paper ++ this.burnTime = Math.max(Short.MIN_VALUE, Math.min(Short.MAX_VALUE, burnTime)); // Paper + } + + /** |