2021-06-11 12:02:28 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2021-06-17 09:37:24 +00:00
|
|
|
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
|
2021-06-11 12:02:28 +00: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
|
2023-04-09 00:00:50 +00:00
|
|
|
index 3da281e454f1f242c57e0174917084557f9c85df..6ec19c038ce3c551b5207028355594f8a0c80bd2 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/Material.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Material.java
|
2023-04-09 00:00:50 +00:00
|
|
|
@@ -4507,6 +4507,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
|
2021-06-11 12:02:28 +00: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);
|
2023-04-09 00:00:50 +00:00
|
|
|
@@ -4705,6 +4706,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
|
2021-06-11 12:02:28 +00: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:
|
2023-04-09 00:00:50 +00:00
|
|
|
@@ -5886,6 +5892,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
|
2021-06-11 12:02:28 +00:00
|
|
|
static {
|
|
|
|
for (Material material : values()) {
|
|
|
|
BY_NAME.put(material.name(), material);
|
|
|
|
+ material.isBlock = material.isBlock0(); // Paper
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|