mirror of https://github.com/PaperMC/Paper.git
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
|
|
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
|
|
}
|
|
}
|
|
|