diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index 817cfc4b6..740c7e362 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -1,22 +1,23 @@ -From 135639c58de544b629f9c8c929160eee1325ef56 Mon Sep 17 00:00:00 2001 +From a0243fa99d5017189d33a96c3a7dd8838245d915 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 17:16:08 -0600 Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index 6304f14..a03865f 100644 +index 662379f..a03865f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,35 +4,37 @@ 4.0.0 -- org.spigotmc -- spigot-parent +- org.sonatype.oss +- oss-parent +- 9 + com.destroystokyo.paper + paper-parent - dev-SNAPSHOT ++ dev-SNAPSHOT - org.spigotmc @@ -94,5 +95,5 @@ index 6304f14..a03865f 100644 maven-shade-plugin 2.4.1 -- -2.8.0 +2.8.1 diff --git a/Spigot-Server-Patches/0108-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0108-Access-items-by-EquipmentSlot.patch index 650222cbc..ac3d04a62 100644 --- a/Spigot-Server-Patches/0108-Access-items-by-EquipmentSlot.patch +++ b/Spigot-Server-Patches/0108-Access-items-by-EquipmentSlot.patch @@ -1,14 +1,14 @@ -From 26eb2568487b8197e971ca7a0515fedf3c7d8ac1 Mon Sep 17 00:00:00 2001 +From 0ae6e2c034dff3b39d0527ab685755d969f6351d Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 20 Mar 2016 06:45:01 -0400 Subject: [PATCH] Access items by EquipmentSlot diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java -index 0902386..19662da 100644 +index 51a8b4e..47654a0 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java -@@ -268,4 +268,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i +@@ -271,4 +271,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i public void setBootsDropChance(float chance) { throw new UnsupportedOperationException(); } @@ -64,5 +64,5 @@ index 0902386..19662da 100644 + // Paper end } -- -2.8.0 +2.8.1 diff --git a/work/CraftBukkit b/work/CraftBukkit index 78434e891..d884ab38d 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 78434e8910379dc42d0c9f439d815a6f40eaf2c8 +Subproject commit d884ab38d82eeab912a9cf866b5b704e60702679 diff --git a/work/Spigot b/work/Spigot index f972b368d..e6f93f4ee 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit f972b368da8f4aa32dea47c27c5ac428b37f70d3 +Subproject commit e6f93f4eed1696907104cb95c00a6f6c035c82f2