3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-18 04:20:08 +01:00

[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
Dieser Commit ist enthalten in:
Aikar 2018-11-12 02:46:43 -05:00
Ursprung 64c6597d79
Commit 5a310cdcdd
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 401ADFC9891FAAFE
2 geänderte Dateien mit 5 neuen und 5 gelöschten Zeilen

Datei anzeigen

@ -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> From: Aikar <aikar@aikar.co>
Date: Sat, 6 Oct 2018 21:14:29 -0400 Date: Sat, 6 Oct 2018 21:14:29 -0400
Subject: [PATCH] Material API additions Subject: [PATCH] Material API additions
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java 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 --- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java
@@ -72,6 +72,7 @@ import org.bukkit.material.MaterialData; @@ -72,6 +72,7 @@ import org.bukkit.material.MaterialData;
@ -16,7 +16,7 @@ index 83f8eca15..98775ea54 100644
public enum Material implements Keyed { public enum Material implements Keyed {
//<editor-fold desc="Materials" defaultstate="collapsed"> //<editor-fold desc="Materials" defaultstate="collapsed">
ACACIA_BOAT(27326, 1), 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. * Do not use for any reason.
* *
-- --
2.19.0 2.19.1

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