From 540bc6f440ea6c2d6448724b9a1f73696f144a71 Mon Sep 17 00:00:00 2001 From: Automated Date: Sat, 11 Aug 2018 03:49:37 -0400 Subject: [PATCH] [Auto] Updated Upstream (Bukkit/CraftBukkit) 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: 1f85e526 SPIGOT-4253: Add way to prioritise item conversion CraftBukkit Changes: 96778caa SPIGOT-4253: Add way to prioritise item conversion --- Spigot-API-Patches/Add-an-asterisk-to-legacy-API-plugins.patch | 2 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-API-Patches/Add-an-asterisk-to-legacy-API-plugins.patch b/Spigot-API-Patches/Add-an-asterisk-to-legacy-API-plugins.patch index 075538d1c..523b05ea0 100644 --- a/Spigot-API-Patches/Add-an-asterisk-to-legacy-API-plugins.patch +++ b/Spigot-API-Patches/Add-an-asterisk-to-legacy-API-plugins.patch @@ -7,7 +7,7 @@ Not here to name and shame, only so server admins can be aware of which plugins have and haven't been updated. diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 20b3a9ee..c4083b4f 100644 +index 33cad901..aff1d8e9 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -0,0 +0,0 @@ public interface UnsafeValues { diff --git a/work/Bukkit b/work/Bukkit index c5ab54d89..1f85e5262 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit c5ab54d8912abadb0426ca9acd701732aa4c6e33 +Subproject commit 1f85e52623dbf90e6d6f482660b34cb15f8f0f1b diff --git a/work/CraftBukkit b/work/CraftBukkit index 29e756487..96778caab 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 29e75648741b877c06165d82241b6b3a417474f6 +Subproject commit 96778caabb82eff6c2155d016bea938cebed3953