mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-09 06:50:32 +08:00
70ad51a80c
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
My recent work on serialization is now in CraftBukkit so was able to drop the patch and Paper
is now consistent with upstream.
Bukkit Changes:
e2699636 Move API notes to more obvious location
CraftBukkit Changes:
1b2830a3 SPIGOT-4441: Fix serializing Components to and from Legacy
42 lines
1.2 KiB
Diff
42 lines
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 57b0d98121cea592dded31165e5e70f6b3bbdaa5..b89fc2dc0b186b99f76d9bf8b1f5daad3e211dfb 100644
|
|
--- a/src/main/java/org/bukkit/Material.java
|
|
+++ b/src/main/java/org/bukkit/Material.java
|
|
@@ -82,6 +82,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">
|
|
ACACIA_BOAT(27326, 1),
|
|
@@ -3306,6 +3307,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.
|
|
*
|