Updated Upstream (Bukkit/CraftBukkit/Spigot)
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
This commit is contained in:
parent
c93f56ac1c
commit
79b873c901
36 changed files with 137 additions and 137 deletions
|
@ -5,7 +5,7 @@ Subject: [PATCH] Material API additions
|
|||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
|
||||
index 41c34903deb148a1100e392030398981880f0419..7bc6a1379d830e05939a9246c31dfc3d2629c9ff 100644
|
||||
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;
|
||||
|
@ -16,7 +16,7 @@ index 41c34903deb148a1100e392030398981880f0419..7bc6a1379d830e05939a9246c31dfc3d
|
|||
public enum Material implements Keyed {
|
||||
//<editor-fold desc="Materials" defaultstate="collapsed">
|
||||
AIR(9648, 0),
|
||||
@@ -3975,6 +3976,22 @@ public enum Material implements Keyed {
|
||||
@@ -3969,6 +3970,22 @@ public enum Material implements Keyed {
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue