Updated Upstream (Bukkit/CraftBukkit)
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: e25c6a75 PR-638: Add CreativeCategory API for Materials CraftBukkit Changes: 86292d3e0 PR-876: Add CreativeCategory API for Materials
This commit is contained in:
parent
90788a556c
commit
d33cdcf2e6
35 changed files with 86 additions and 86 deletions
|
@ -5,10 +5,10 @@ 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 0f8712cef078c11e49bcd73d556d9edce5057952..5764944121a0e47a8f6decb75fbc6331a15e3d9d 100644
|
||||
index 82bd673f43f26d62f1f4bea3638fd89d9eef3887..9f0048888a2fe40316154613a722d1c709fd3856 100644
|
||||
--- a/src/main/java/org/bukkit/Material.java
|
||||
+++ b/src/main/java/org/bukkit/Material.java
|
||||
@@ -3931,6 +3931,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
|
||||
@@ -3932,6 +3932,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
|
||||
public final Class<?> data;
|
||||
private final boolean legacy;
|
||||
private final NamespacedKey key;
|
||||
|
@ -16,7 +16,7 @@ index 0f8712cef078c11e49bcd73d556d9edce5057952..5764944121a0e47a8f6decb75fbc6331
|
|||
|
||||
private Material(final int id) {
|
||||
this(id, 64);
|
||||
@@ -4135,6 +4136,11 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
|
||||
@@ -4136,6 +4137,11 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
|
||||
* @return true if this material is a block
|
||||
*/
|
||||
public boolean isBlock() {
|
||||
|
@ -28,7 +28,7 @@ index 0f8712cef078c11e49bcd73d556d9edce5057952..5764944121a0e47a8f6decb75fbc6331
|
|||
switch (this) {
|
||||
//<editor-fold defaultstate="collapsed" desc="isBlock">
|
||||
case ACACIA_BUTTON:
|
||||
@@ -5216,6 +5222,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
|
||||
@@ -5217,6 +5223,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
|
||||
static {
|
||||
for (Material material : values()) {
|
||||
BY_NAME.put(material.name(), material);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue