[Auto] Updated Upstream (Bukkit)
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 Bukkit Changes: 3aee9dbd Add Material BlockData to JavaDocs
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
From 96b6ec1a816d21b6c3eaabce56ccfa7c9d44afdb Mon Sep 17 00:00:00 2001
|
||||
From 36f2224286f0b66b0230f0ad4cfd914c603d8488 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 83f8eca15..98775ea54 100644
|
||||
index 14cae61fb..393024343 100644
|
||||
--- a/src/main/java/org/bukkit/Material.java
|
||||
+++ b/src/main/java/org/bukkit/Material.java
|
||||
@@ -72,6 +72,7 @@ import org.bukkit.material.MaterialData;
|
||||
@@ -16,7 +16,7 @@ index 83f8eca15..98775ea54 100644
|
||||
public enum Material implements Keyed {
|
||||
//<editor-fold desc="Materials" defaultstate="collapsed">
|
||||
ACACIA_BOAT(27326, 1),
|
||||
@@ -1931,6 +1932,22 @@ public enum Material implements Keyed {
|
||||
@@ -2984,6 +2985,22 @@ public enum Material implements Keyed {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,5 +40,5 @@ index 83f8eca15..98775ea54 100644
|
||||
* Do not use for any reason.
|
||||
*
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
||||
|
||||
Submodule work/Bukkit updated: 67e91ef777...3aee9dbd08
Reference in New Issue
Block a user