geforkt von Mirrors/Paper
b5ce6e3dc5
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: eb4b416d PR-822: Add experimental armor trim API 33498e1d PR-831: Add a standard of annotations for Minecraft experimental things and API CraftBukkit Changes: 19de3550d SPIGOT-7315: Bed placement duplicates crops if cancelled 1eb88374e PR-1147: Add experimental armor trim API c4c0bb0e9 Show clean error for invalidly configured server.properties options 3ae90697f Fix UUID not being updated when changing world of MapView e43000601 PR-1164, MC-227255, MC-253819: Fix rotation of beehives and bells Spigot Changes: d2fdfe39 Rebuild patches
39 Zeilen
1.5 KiB
Diff
39 Zeilen
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 3da281e454f1f242c57e0174917084557f9c85df..6ec19c038ce3c551b5207028355594f8a0c80bd2 100644
|
|
--- a/src/main/java/org/bukkit/Material.java
|
|
+++ b/src/main/java/org/bukkit/Material.java
|
|
@@ -4507,6 +4507,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);
|
|
@@ -4705,6 +4706,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:
|
|
@@ -5886,6 +5892,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
|
|
}
|
|
}
|
|
|