Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-10-01 16:07:36 +02:00
Code Issues Projects Releases Wiki Activity

[Auto] Updated Upstream (Bukkit)

Browse Source 
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:
Aikar 2018-11-12 02:46:43 -05:00
parent 64c6597d79
commit 5a310cdcdd
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-API-Patches/0157-Material-API-additions.patch
View File

@ -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

2
work/Bukkit

@ -1 +1 @@
Subproject commit 67e91ef77757f4affbb1ba7867bd2913e3a2a654
Subproject commit 3aee9dbd0894558ae1178a50872d66592bbdfd1e