2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2021-06-17 11:37:24 +02:00
|
|
|
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
|
2021-06-11 14:02:28 +02:00
|
|
|
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
|
2022-06-07 19:03:07 +02:00
|
|
|
index f2ca0a11f0d7f8c48f7464045eded5486c1128af..b93f0af3a06ee4fb00964066e1b6d1d13dfec5c3 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/Material.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Material.java
|
2022-03-03 19:21:48 +01:00
|
|
|
@@ -3932,6 +3932,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
|
2021-06-11 14:02:28 +02:00
|
|
|
public final Class<?> data;
|
|
|
|
private final boolean legacy;
|
|
|
|
private final NamespacedKey key;
|
|
|
|
+ private boolean isBlock; // Paper
|
|
|
|
|
|
|
|
private Material(final int id) {
|
|
|
|
this(id, 64);
|
2022-05-16 04:33:03 +02:00
|
|
|
@@ -4138,6 +4139,11 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
|
2021-06-11 14:02:28 +02:00
|
|
|
* @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:
|
2022-05-16 04:33:03 +02:00
|
|
|
@@ -5219,6 +5225,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
|
2021-06-11 14:02:28 +02:00
|
|
|
static {
|
|
|
|
for (Material material : values()) {
|
|
|
|
BY_NAME.put(material.name(), material);
|
|
|
|
+ material.isBlock = material.isBlock0(); // Paper
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|