[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:
162807b3 Remove some draft API designations
This commit is contained in:
Aikar 2018-10-25 06:01:38 -04:00
parent 238e5a2d1f
commit 80b6894798
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
2 changed files with 5 additions and 5 deletions

View File

@ -1,14 +1,14 @@
From f0bdeecfc35f492bd8b81ad517e209611fff0d6f Mon Sep 17 00:00:00 2001
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Wed, 12 Sep 2018 18:53:35 +0300
Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values
diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
index 8d8f09879..97fa7807b 100644
index 7ac07ac07ac0..7ac07ac07ac0 100644
--- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
@@ -350,4 +350,33 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable {
@@ -348,4 +348,33 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable {
Spigot spigot();
// Spigot end
@ -43,5 +43,5 @@ index 8d8f09879..97fa7807b 100644
+ // Paper end
}
--
2.19.0
2.19.1

@ -1 +1 @@
Subproject commit bc9c12c067982e5513d59b88fb178b5a485f1841
Subproject commit 162807b39b55cb2ceb340fa73d551ab5c462d2c8