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/0259-Cache-the-result-of-Material-isBlock.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/0259-Cache-the-result-of-Material-isBlock.patch')
| -rw-r--r-- | patches/api/0259-Cache-the-result-of-Material-isBlock.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/patches/api/0259-Cache-the-result-of-Material-isBlock.patch b/patches/api/0259-Cache-the-result-of-Material-isBlock.patch new file mode 100644 index 0000000000..ee04af53bb --- /dev/null +++ b/patches/api/0259-Cache-the-result-of-Material-isBlock.patch @@ -0,0 +1,38 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jason Penilla <[email protected]> +Date: Tue, 2 Mar 2021 15:24:58 -0800 +Subject: [PATCH] Cache the result of Material#isBlock + + +diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java +index af1dca2385215e8fd19353aa6e9c024d4ad814e1..85604d2c364c41fed24257a9b02ceeb58712f6a2 100644 +--- a/src/main/java/org/bukkit/Material.java ++++ b/src/main/java/org/bukkit/Material.java +@@ -4643,6 +4643,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla + public final Class<?> data; + private final boolean legacy; + private final NamespacedKey key; ++ private boolean isBlock; // Paper + + private Material(final int id) { + this(id, 64); +@@ -4841,6 +4842,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla + * @return true if this material is a block + */ + public boolean isBlock() { ++ // Paper start - cache isBlock ++ return this.isBlock; ++ } ++ private boolean isBlock0() { ++ // Paper end + switch (this) { + //<editor-fold defaultstate="collapsed" desc="isBlock"> + case ACACIA_BUTTON: +@@ -6082,6 +6088,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla + static { + for (Material material : values()) { + BY_NAME.put(material.name(), material); ++ material.isBlock = material.isBlock0(); // Paper + } + } + |