Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
parent
8b1734123e
commit
3a43821c38
859 changed files with 561 additions and 656 deletions
38
patches/api/0271-Cache-the-result-of-Material-isBlock.patch
Normal file
38
patches/api/0271-Cache-the-result-of-Material-isBlock.patch
Normal file
|
@ -0,0 +1,38 @@
|
|||
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 0f8712cef078c11e49bcd73d556d9edce5057952..5764944121a0e47a8f6decb75fbc6331a15e3d9d 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
|
||||
public final Class<?> data;
|
||||
private final boolean legacy;
|
||||
private final NamespacedKey key;
|
||||
+ private boolean isBlock; // Paper
|
||||
|
||||
private Material(final int id) {
|
||||
this(id, 64);
|
||||
@@ -4135,6 +4136,11 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
|
||||
* @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:
|
||||
@@ -5216,6 +5222,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
|
||||
static {
|
||||
for (Material material : values()) {
|
||||
BY_NAME.put(material.name(), material);
|
||||
+ material.isBlock = material.isBlock0(); // Paper
|
||||
}
|
||||
}
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue