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:
d58803c2 SPIGOT-4597: Make BlockDropItemEvent use a list
d450fdf1 Add note about Maven repository usage to pom.xml

CraftBukkit Changes:
ed274c51 SPIGOT-4597: Make BlockDropItemEvent use a list
1734f378 SPIGOT-4598: Shift click on custom workbench inventory causes crash
a65b73ad Add note about Maven repository usage to pom.xml
This commit is contained in:
Shane Freeder 2019-01-30 13:26:12 +00:00
parent e3f2448ae1
commit e87859d8a5
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
22 changed files with 123 additions and 121 deletions

View file

@ -1,14 +1,14 @@
From ffc2ee319da1ad8b57a13d9aa0dd8711ce6ee4ad Mon Sep 17 00:00:00 2001
From 02d5007d081bde67f58dac3e04ce1df9e70ff9b4 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 00:16:08 +0100
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index 00d8019d9..148c322bc 100644
index 23fde9622..a613cf963 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,38 +3,37 @@
@@ -3,33 +3,28 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@ -53,7 +53,9 @@ index 00d8019d9..148c322bc 100644
- </distributionManagement>
-
<repositories>
<repository>
<!--
If you are a plugin developer, please use https://hub.spigotmc.org/nexus/content/repositories/snapshots/
@@ -41,6 +36,10 @@
<id>spigotmc-public</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
@ -64,7 +66,7 @@ index 00d8019d9..148c322bc 100644
</repositories>
<pluginRepositories>
@@ -57,6 +56,13 @@
@@ -63,6 +62,13 @@
<version>1.1.1</version>
<scope>compile</scope>
</dependency>
@ -78,7 +80,7 @@ index 00d8019d9..148c322bc 100644
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -101,15 +107,12 @@
@@ -107,15 +113,12 @@
</dependencies>
<build>
@ -95,7 +97,7 @@ index 00d8019d9..148c322bc 100644
<dependencies>
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
@@ -144,6 +147,7 @@
@@ -150,6 +153,7 @@
</execution>
</executions>
<configuration>