Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
79b873c901
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: 64c8bd39 #679: Add getHideOnlinePlayers b991b6c7 #677: Add "Allow Server Listings" API 4e9f199a SPIGOT-6801: Wrong BlockData classes in Material enum for SOUL_FIRE and SOUL_TORCH CraftBukkit Changes: 37e63e63 Fix loading / creating secondary worlds (nether/end) 4bf7f33c #956: Add getHideOnlinePlayers d181e1ed Fix serializing unhandled NBT + add unit test with unhandled NBT aebb79e3 #954: Add "Allow Server Listings" API 7c4707e4 #955: Add test for BlockData class of Material Spigot Changes: 16c0cb41 Rebuild patches
42 Zeilen
1.2 KiB
Diff
42 Zeilen
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sat, 6 Oct 2018 21:14:29 -0400
|
|
Subject: [PATCH] Material API additions
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
|
|
index 2a0773e0981f8470eb897ffd9178bb97e8365050..58c3ab444d484ac781810e26e04b9919eaff3bf2 100644
|
|
--- a/src/main/java/org/bukkit/Material.java
|
|
+++ b/src/main/java/org/bukkit/Material.java
|
|
@@ -99,6 +99,7 @@ import org.jetbrains.annotations.Nullable;
|
|
/**
|
|
* An enum of all material IDs accepted by the official server and client
|
|
*/
|
|
+@SuppressWarnings({"DeprecatedIsStillUsed", "deprecation"}) // Paper
|
|
public enum Material implements Keyed {
|
|
//<editor-fold desc="Materials" defaultstate="collapsed">
|
|
AIR(9648, 0),
|
|
@@ -3969,6 +3970,22 @@ public enum Material implements Keyed {
|
|
}
|
|
}
|
|
|
|
+ // Paper start
|
|
+
|
|
+ /**
|
|
+ * @return If the type is either AIR, CAVE_AIR or VOID_AIR
|
|
+ */
|
|
+ public boolean isEmpty() {
|
|
+ switch (this) {
|
|
+ case AIR:
|
|
+ case CAVE_AIR:
|
|
+ case VOID_AIR:
|
|
+ return true;
|
|
+ }
|
|
+ return false;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Do not use for any reason.
|
|
*
|